updates

9 files changed, 35 insertions, 26 deletions

diff --git a/lib/Xp/XpAttr.c b/lib/Xp/XpAttr.c
index 9a530129a..04bff8262 100644
--- a/lib/Xp/XpAttr.c
+++ b/lib/Xp/XpAttr.c
@@ -34,6 +34,7 @@
  **
  ******************************************************************************
  *****************************************************************************/
+/* $XFree86$ */
 
 #define NEED_REPLIES
 
@@ -92,7 +93,7 @@ XpGetAttributes (
 
     _XReadPad (dpy, (char *) buf, (long) rep.stringLen );
 
-    buf[rep.stringLen] = NULL;		/* tack on NULL terminator */
+    buf[rep.stringLen] = '\0';		/* tack on NULL terminator */
 
     UnlockDisplay(dpy);
     SyncHandle();
@@ -153,10 +154,10 @@ XpGetOneAttribute (
         return( (char *) NULL ); /* malloc error */
     }
 
-    buf[rep.valueLen] = NULL;
+    buf[rep.valueLen] = '\0';
 
     _XReadPad (dpy, (char *) buf, (long) rep.valueLen );
-    buf[rep.valueLen] = NULL;		/* tack on NULL terminator */
+    buf[rep.valueLen] = '\0';		/* tack on NULL terminator */
 
     UnlockDisplay(dpy);
     SyncHandle();
diff --git a/lib/Xp/XpPrinter.c b/lib/Xp/XpPrinter.c
index e2f96bcec..72f5d0b6e 100644
--- a/lib/Xp/XpPrinter.c
+++ b/lib/Xp/XpPrinter.c
@@ -34,6 +34,7 @@
  **
  ******************************************************************************
  *****************************************************************************/
+/* $XFree86$ */
 
 #define NEED_REPLIES
 
@@ -161,7 +162,7 @@ XpGetPrinterList (
 		}
 
 		_XReadPad (dpy, (char *) dataVR, (long) dataLenVR);
-		dataVR[dataLenVR] = NULL;	/* add NULL termination */
+		dataVR[dataLenVR] = '\0';	/* add NULL termination */
 		ptr_list[i].name = (char *) dataVR;
 	    }
 	    else {
@@ -183,7 +184,7 @@ XpGetPrinterList (
 		}
 
 		_XReadPad (dpy, (char *) dataVR, (long) dataLenVR);
-		dataVR[dataLenVR] = NULL;	/* add NULL termination */
+		dataVR[dataLenVR] = '\0';	/* add NULL termination */
 		ptr_list[i].desc = (char *) dataVR;
 	    }
 	    else {
diff --git a/programs/Xserver/Xprint/Util.c b/programs/Xserver/Xprint/Util.c
index 51a1045e2..36644535c 100644
--- a/programs/Xserver/Xprint/Util.c
+++ b/programs/Xserver/Xprint/Util.c
@@ -30,6 +30,13 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
+/* $XFree86$ */
+
+/* To get the tempnam() prototype in <stdio.h> */
+#if defined(linux) && defined(__STRICT_ANSI__)
+#undef __STRICT_ANSI__
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #include <sys/wait.h>
diff --git a/programs/Xserver/Xprint/attributes.c b/programs/Xserver/Xprint/attributes.c
index 640d423ea..301c00389 100644
--- a/programs/Xserver/Xprint/attributes.c
+++ b/programs/Xserver/Xprint/attributes.c
@@ -44,6 +44,7 @@ copyright holders.
 **    *********************************************************
 ** 
 ********************************************************************/
+/* $XFree86$ */
 
 #include <Xproto.h>
 #include <string.h>
@@ -1233,7 +1234,7 @@ ReplaceAllKeywords(
     return command;
 }
 
-#if defined(CSRG_BASED) || defined(linux) || (defined(sun) && !defined(SVR4))
+#if defined(CSRG_BASED) || defined(linux) || (defined(sun) && !defined(SVR4)) || (defined(SVR4) && !defined(sun) && !defined(USL))
 #define iswspace(c) (isascii(c) && isspace(toascii(c)))
 #endif
 
diff --git a/programs/Xserver/Xprint/ddxInit.c b/programs/Xserver/Xprint/ddxInit.c
index 7a5b0d5a9..6b214faf0 100644
--- a/programs/Xserver/Xprint/ddxInit.c
+++ b/programs/Xserver/Xprint/ddxInit.c
@@ -30,7 +30,7 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/Xprint/ddxInit.c,v 1.2 1996/12/24 08:47:41 dawes Exp $ */
 
 #include "X.h"
 #include "Xproto.h"
@@ -181,8 +181,8 @@ InitInput(argc, argv)
 {
     DeviceIntPtr ptr, kbd;
 
-    ptr = AddInputDevice(PointerProc, TRUE);
-    kbd = AddInputDevice(KeyboardProc, TRUE);
+    ptr = AddInputDevice((DeviceProc)PointerProc, TRUE);
+    kbd = AddInputDevice((DeviceProc)KeyboardProc, TRUE);
     RegisterPointerDevice(ptr);
     RegisterKeyboardDevice(kbd);
     return;
diff --git a/programs/Xserver/Xprint/pcl/PclColor.c b/programs/Xserver/Xprint/pcl/PclColor.c
index f9592492f..a96b81846 100644
--- a/programs/Xserver/Xprint/pcl/PclColor.c
+++ b/programs/Xserver/Xprint/pcl/PclColor.c
@@ -45,13 +45,14 @@ not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from said
 copyright holders.
 */
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.2 1996/12/25 04:01:53 dawes Exp $ */
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/wait.h>
 #include <unistd.h>
+#include <math.h>
 
 #include "colormapst.h"
 #include "windowstr.h"
@@ -689,7 +690,6 @@ void PclLookUp(
 *******************************************************************************
 *
 * File:         xpmap.c
-* RCS:          $Header$
 * Description:  3d color mapper for Xp contributed PCL driver.
 * Author:       Andrew Fitzhugh
 * Created:      Fri Feb 16 11:41:08 1996
@@ -705,7 +705,6 @@ void PclLookUp(
 
 /* Compile with "cc -Ae -o xpmap xpmap.c" */
 
-#include <math.h>
 
 unsigned char *PclReadMap(char *name, int *dim)
 {
diff --git a/programs/Xserver/lbx/lbxmain.c b/programs/Xserver/lbx/lbxmain.c
index 4a8a78ad8..0c573a8ea 100644
--- a/programs/Xserver/lbx/lbxmain.c
+++ b/programs/Xserver/lbx/lbxmain.c
@@ -1,4 +1,4 @@
-/* $XConsortium: lbxmain.c /main/69 1996/12/19 19:10:51 rws $ */
+/* $XConsortium: lbxmain.c /main/71 1996/12/22 12:36:03 rws $ */
 /*
  * Copyright 1992 Network Computing Devices
  * Copyright 1996 X Consortium, Inc.
@@ -21,6 +21,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
+/* $XFree86$ */
  
 #include <sys/types.h>
 #define NEED_REPLIES
@@ -497,7 +498,7 @@ LbxReplyCallback(pcbl, nulldata, calldata)
 /* ARGSUSED */
 static Bool
 LbxCheckCompressInput (dummy1, dummy2)
-    pointer dummy1;
+    ClientPtr dummy1;
     pointer dummy2;
 {
     LbxProxyPtr	    proxy;
@@ -514,14 +515,13 @@ LbxCheckCompressInput (dummy1, dummy2)
 }
 
 static Bool
-LbxIsClientBlocked (client)
-    ClientPtr	client;
+LbxIsClientBlocked (lbxClient)
+    LbxClientPtr	lbxClient;
 {
-    LbxClientPtr	lbxClient = LbxClient(client);
     LbxProxyPtr		proxy = lbxClient->proxy;
     
     return (lbxClient->ignored ||
-	    (GrabInProgress && client->index != GrabInProgress &&
+	    (GrabInProgress && lbxClient->client->index != GrabInProgress &&
 	     lbxClient != proxy->lbxClients[0]));
 }
 
@@ -562,7 +562,7 @@ LbxWaitForUnblocked (client, closure)
     if (!lbxClient)
 	return TRUE;
     proxy = lbxClient->proxy;
-    if (LbxIsClientBlocked (client) ||
+    if (LbxIsClientBlocked (lbxClient) ||
 	((lbxClient != proxy->curDix) && proxy->curDix->reqs_pending &&
 	 !LbxIsClientBlocked(proxy->curDix)))
 	return FALSE;
@@ -713,7 +713,7 @@ LbxReadRequestFromClient (client)
 
     if (GrabInProgress && (proxy->grabClient != GrabInProgress))
 	LbxServerGrab(proxy);
-    isblocked = LbxIsClientBlocked(client);
+    isblocked = LbxIsClientBlocked(lbxClient);
 
     if (lbxClient->reqs_pending && !isblocked) {
 	if (!--lbxClient->reqs_pending && (lbxClient != proxy->curRecv))
@@ -1377,8 +1377,7 @@ ProcLbxNewClient(client)
     newClient = AllocLbxClientConnection (client, proxy);
     if (!newClient)
 	return BadAlloc;
-    if (proxy->useTags)
-	newClient->requestVector = LbxInitialVector;
+    newClient->requestVector = LbxInitialVector;
     lbxClient = LbxInitClient (proxy, newClient, id);
     if (!lbxClient)
     {
diff --git a/programs/xmh/miscfuncs.c b/programs/xmh/miscfuncs.c
index 6d606269b..7c92bf78a 100644
--- a/programs/xmh/miscfuncs.c
+++ b/programs/xmh/miscfuncs.c
@@ -1,5 +1,5 @@
 /* $XConsortium: miscfuncs.c,v 1.7 94/12/01 17:15:05 kaleb Exp $ */
-/* $XFree86: xc/programs/xmh/miscfuncs.c,v 3.1 1995/01/28 16:17:33 dawes Exp $ */
+/* $XFree86: xc/programs/xmh/miscfuncs.c,v 3.2 1996/06/10 09:18:25 dawes Exp $ */
 
 #include <X11/Xos.h>
 
@@ -169,7 +169,7 @@ ScanDir(Name, List, Selector)
 
     /* Sort? */
     if (i)
-	qsort((char *)names, i, sizeof(char *), StrCmp);
+	qsort((char *)names, i, sizeof(char *), (int (*)())StrCmp);
 
     return(i);
 }
diff --git a/programs/xrdb/xrdb.c b/programs/xrdb/xrdb.c
index 66a15aa4a..279561d7e 100644
--- a/programs/xrdb/xrdb.c
+++ b/programs/xrdb/xrdb.c
@@ -2,7 +2,7 @@
  * xrdb - X resource manager database utility
  *
  * $XConsortium: xrdb.c,v 11.76 95/05/12 18:36:46 mor Exp $
- * $XFree86: xc/programs/xrdb/xrdb.c,v 3.5 1996/09/03 15:13:49 dawes Exp $
+ * $XFree86: xc/programs/xrdb/xrdb.c,v 3.6 1996/11/18 13:25:27 dawes Exp $
  */
 
 /*
@@ -1054,7 +1054,8 @@ void FormatEntries(buffer, entries)
     if (!entries->used)
 	return;
     if (oper == OPMERGE)
-	qsort(entries->entry, entries->used, sizeof(Entry), CompareEntries);
+	qsort(entries->entry, entries->used, sizeof(Entry),
+	      (int (*)())CompareEntries);
     for (i = 0; i < entries->used; i++) {
 	if (entries->entry[i].usable)
 	    AppendEntryToBuffer(buffer, &entries->entry[i]);