From c7f21c05b01c7dc3dee980256330d935e9c9e307 Mon Sep 17 00:00:00 2001
From: gildea <empty>
Date: Thu, 8 Jun 1995 23:20:39 +0000
Subject: change #if __STDC__ to #ifdef __STDC__ so can pass -Xa instead of -Xc
 to SVR4 compilers. See advisory message of 21 April 1995.

---
 xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c     |  4 ++--
 xc/programs/Xserver/PEX5/ddpex/mi/level2/miDestroy.c  |  4 ++--
 xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c  |  4 ++--
 xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c  |  4 ++--
 xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c |  4 ++--
 xc/programs/Xserver/PEX5/dipex/swap/ConvName.h        |  4 ++--
 xc/programs/Xserver/cfb/cfbmap.h                      | 10 +++++-----
 xc/programs/Xserver/cfb/cfbrrop.h                     |  4 ++--
 xc/programs/Xserver/mfb/mergerop.h                    |  4 ++--
 xc/programs/xclock/Clock.c                            |  4 ++--
 xc/programs/xdm/chooser.c                             | 19 ++++++++++++-------
 xc/programs/xdm/session.c                             |  4 ++--
 xc/programs/xfs/include/misc.h                        |  4 ++--
 xc/programs/xterm/TekPrsTbl.c                         |  4 ++--
 14 files changed, 41 insertions(+), 36 deletions(-)

(limited to 'xc/programs')

diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c
index fe57a726e..6de8253d4 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miCopy.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miCopy.c,v 5.7 93/09/03 15:06:04 hersh Exp $ */
+/* $XConsortium: miCopy.c,v 5.8 94/04/17 20:37:04 hersh Exp gildea $ */
 
 /***********************************************************
 
@@ -71,7 +71,7 @@ SOFTWARE.
     happen during freeing of storage.
  */
 
-#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP)
+#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
 #define CAT(a,b)    a##b
 #else
 #define CAT(a,b)    a/**/b
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miDestroy.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miDestroy.c
index 086dc965d..46e1759ff 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miDestroy.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miDestroy.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miDestroy.c,v 5.2 93/02/08 11:06:01 rws Exp $ */
+/* $XConsortium: miDestroy.c,v 5.3 94/04/17 20:37:05 rws Exp gildea $ */
 
 /***********************************************************
 
@@ -64,7 +64,7 @@ SOFTWARE.
  ****Note that these functions may be replaced by PEX server porters.
  **/
 
-#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP)
+#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
 #define CAT(a,b)    a##b
 #else
 #define CAT(a,b)    a/**/b
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c
index 3cd6729e9..e3e285399 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miInquire.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miInquire.c,v 5.8 93/09/03 15:06:07 hersh Exp $ */
+/* $XConsortium: miInquire.c,v 5.9 94/04/17 20:37:06 hersh Exp gildea $ */
 
 /***********************************************************
 
@@ -69,7 +69,7 @@ SOFTWARE.
     a corresponding modification to the level function tables (miTables.c)
  */
 
-#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP)
+#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
 #define CAT(a,b)    a##b
 #else
 #define CAT(a,b)    a/**/b
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c
index 9f41311c6..ab45c3abb 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/miReplace.c
@@ -1,4 +1,4 @@
-/* $XConsortium: miReplace.c,v 5.3 93/02/08 11:09:27 rws Exp $ */
+/* $XConsortium: miReplace.c,v 5.4 94/04/17 20:37:17 rws Exp gildea $ */
 
 /***********************************************************
 
@@ -77,7 +77,7 @@ extern void ParseVertexData();
 extern int  CountFacetOptData();
 extern int  CountVertexData();
 
-#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP)
+#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
 #define CAT(a,b)    a##b
 #else
 #define CAT(a,b)    a/**/b
diff --git a/xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c b/xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c
index d18b179d9..2dc3aacd9 100644
--- a/xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c
+++ b/xc/programs/Xserver/PEX5/ddpex/mi/level2/pexOCParse.c
@@ -1,4 +1,4 @@
-/* $XConsortium: pexOCParse.c,v 5.8 93/09/03 15:05:52 hersh Exp $ */
+/* $XConsortium: pexOCParse.c,v 5.9 94/04/17 20:37:23 hersh Exp gildea $ */
 
 /***********************************************************
 
@@ -95,7 +95,7 @@ SOFTWARE.
  **	copy and inquire routines (see miCopy.c and miInquire.c).
  **/
 
-#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP)
+#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
 #define CAT(a,b)    a##b
 #else
 #define CAT(a,b)    a/**/b
diff --git a/xc/programs/Xserver/PEX5/dipex/swap/ConvName.h b/xc/programs/Xserver/PEX5/dipex/swap/ConvName.h
index 21be40aff..9400af7f3 100644
--- a/xc/programs/Xserver/PEX5/dipex/swap/ConvName.h
+++ b/xc/programs/Xserver/PEX5/dipex/swap/ConvName.h
@@ -1,4 +1,4 @@
-/* $XConsortium: ConvName.h,v 5.2 93/02/08 11:02:32 rws Exp $ */
+/* $XConsortium: ConvName.h,v 5.3 94/04/17 20:36:15 rws Exp gildea $ */
 
 /***********************************************************
 
@@ -48,7 +48,7 @@ SOFTWARE.
 ******************************************************************/
 
 
-#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP)
+#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
 #define SWAP_FUNC_PREFIX(nm)	c##nm
 #define SWAP_FUNC_PEX_PFX(nm)	cPEX##nm
 #else
diff --git a/xc/programs/Xserver/cfb/cfbmap.h b/xc/programs/Xserver/cfb/cfbmap.h
index a50424c25..cde696667 100644
--- a/xc/programs/Xserver/cfb/cfbmap.h
+++ b/xc/programs/Xserver/cfb/cfbmap.h
@@ -1,5 +1,5 @@
 /*
- * $XConsortium: cfbmap.h,v 1.9 94/04/17 20:28:54 dpw Exp dpw $
+ * $XConsortium: cfbmap.h,v 1.10 94/09/22 21:12:06 dpw Exp gildea $
  *
 Copyright (c) 1991  X Consortium
 
@@ -35,7 +35,7 @@ in this Software without prior written authorization from the X Consortium.
 
 #if PSZ != 8
 #if PSZ == 32
-#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP)
+#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
 #define NAME(subname) cfb32##subname
 #else
 #define NAME(subname) cfb32/**/subname
@@ -43,7 +43,7 @@ in this Software without prior written authorization from the X Consortium.
 #endif
 
 #if PSZ == 16
-#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP)
+#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
 #define NAME(subname) cfb16##subname
 #else
 #define NAME(subname) cfb16/**/subname
@@ -51,7 +51,7 @@ in this Software without prior written authorization from the X Consortium.
 #endif
 
 #if PSZ == 4
-#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP)
+#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
 #define NAME(subname) cfb4##subname
 #else
 #define NAME(subname) cfb4/**/subname
@@ -62,7 +62,7 @@ in this Software without prior written authorization from the X Consortium.
 cfb can not hack PSZ yet
 #endif
 
-#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP)
+#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
 #define CATNAME(prefix,subname) prefix##subname
 #else
 #define CATNAME(prefix,subname) prefix/**/subname
diff --git a/xc/programs/Xserver/cfb/cfbrrop.h b/xc/programs/Xserver/cfb/cfbrrop.h
index 0d7752cbf..5feb594e4 100644
--- a/xc/programs/Xserver/cfb/cfbrrop.h
+++ b/xc/programs/Xserver/cfb/cfbrrop.h
@@ -1,5 +1,5 @@
 /*
- * $XConsortium: cfbrrop.h,v 1.8 93/12/13 17:22:28 dpw Exp $
+ * $XConsortium: cfbrrop.h,v 1.9 94/04/17 20:29:00 dpw Exp gildea $
  *
 Copyright (c) 1989  X Consortium
 
@@ -144,7 +144,7 @@ in this Software without prior written authorization from the X Consortium.
     }
 #endif
 
-#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP)
+#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
 #define RROP_NAME_CAT(prefix,suffix)	prefix##suffix
 #else
 #define RROP_NAME_CAT(prefix,suffix)	prefix/**/suffix
diff --git a/xc/programs/Xserver/mfb/mergerop.h b/xc/programs/Xserver/mfb/mergerop.h
index 6d88024d9..35b507022 100644
--- a/xc/programs/Xserver/mfb/mergerop.h
+++ b/xc/programs/Xserver/mfb/mergerop.h
@@ -1,5 +1,5 @@
 /*
- * $XConsortium: mergerop.h,v 1.9 94/01/12 18:04:22 dpw Exp $
+ * $XConsortium: mergerop.h,v 1.10 94/04/17 20:28:14 dpw Exp gildea $
  *
 Copyright (c) 1989  X Consortium
 
@@ -178,7 +178,7 @@ extern mergeRopRec	mergeRopBits[16];
 #define MROP_PREBUILT_MASK(src,dst,mask)    MROP_MASK(src,dst,mask)
 #endif
 
-#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP)
+#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
 #define MROP_NAME_CAT(prefix,suffix)	prefix##suffix
 #else
 #define MROP_NAME_CAT(prefix,suffix)	prefix/**/suffix
diff --git a/xc/programs/xclock/Clock.c b/xc/programs/xclock/Clock.c
index bdec2d6d6..845880c10 100644
--- a/xc/programs/xclock/Clock.c
+++ b/xc/programs/xclock/Clock.c
@@ -1,4 +1,4 @@
-/* $XConsortium: Clock.c,v 1.72 94/01/17 19:06:17 rws Exp $ */
+/* $XConsortium: Clock.c,v 1.73 94/04/17 20:23:50 rws Exp gildea $ */
 
 /***********************************************************
 
@@ -54,7 +54,7 @@ SOFTWARE.
 #include "ClockP.h"
 #include <X11/Xosdefs.h>
 
-#if __STDC__ && !defined(AIXV3) /* AIX is broken */
+#if defined(__STDC__) && !defined(AIXV3) /* AIX is broken */
 #define Const const
 #else
 #define Const /**/
diff --git a/xc/programs/xdm/chooser.c b/xc/programs/xdm/chooser.c
index 8ecca3d4b..7331ea02a 100644
--- a/xc/programs/xdm/chooser.c
+++ b/xc/programs/xdm/chooser.c
@@ -1,5 +1,5 @@
 /*
- * $XConsortium: chooser.c,v 1.20 94/06/03 16:34:39 mor Exp kaleb $
+ * $XConsortium: chooser.c,v 1.21 94/11/21 18:33:11 kaleb Exp gildea $
  *
 Copyright (c) 1990  X Consortium
 
@@ -188,7 +188,7 @@ int	NameTableSize;
 
 static int
 HostnameCompare (a, b)
-#if __STDC__
+#ifdef __STDC__
     const void *a, *b;
 #else
     char *a, *b;
@@ -199,6 +199,7 @@ HostnameCompare (a, b)
 
 static void
 RebuildTable (size)
+    int size;
 {
     char	**newTable = 0;
     HostName	*names;
@@ -325,7 +326,7 @@ AddHostname (hostname, status, addr, willing)
     return 1;
 }
 
-static
+static void
 DisposeHostname (host)
     HostName	*host;
 {
@@ -336,7 +337,7 @@ DisposeHostname (host)
     free ((char *) host);
 }
 
-static
+static void
 RemoveHostname (host)
     HostName	*host;
 {
@@ -357,7 +358,7 @@ RemoveHostname (host)
     RebuildTable (NameTableSize);
 }
 
-static
+static void
 EmptyHostnames ()
 {
     HostName	*hosts, *next;
@@ -434,6 +435,7 @@ ReceivePacket (closure, source, id)
     }
 }
 
+static void
 RegisterHostaddr (addr, len, type)
     struct sockaddr *addr;
     int		    len;
@@ -466,6 +468,7 @@ RegisterHostaddr (addr, len, type)
  *  addresses on the local host.
  */
 
+static void
 RegisterHostname (name)
     char    *name;
 {
@@ -613,6 +616,7 @@ n = ifcp->ifc_len / sizeof (struct ifreq);
 
 static ARRAYofARRAY8	AuthenticationNames;
 
+static void
 RegisterAuthenticationName (name, namelen)
     char    *name;
     int	    namelen;
@@ -627,13 +631,13 @@ RegisterAuthenticationName (name, namelen)
     memmove( authName->data, name, namelen);
 }
 
+int
 InitXDMCP (argv)
     char    **argv;
 {
     int	soopts = 1;
     XdmcpHeader	header;
     int	i;
-    int optlen;
 
     header.version = XDM_PROTOCOL_VERSION;
     header.opcode = (CARD16) BROADCAST_QUERY;
@@ -676,7 +680,7 @@ InitXDMCP (argv)
     return 1;
 }
 
-Boolean
+static void
 Choose (h)
     HostName	*h;
 {
@@ -863,6 +867,7 @@ static XtActionsRec app_actions[] = {
 };
 
 main (argc, argv)
+    int     argc;
     char    **argv;
 {
     Arg		position[3];
diff --git a/xc/programs/xdm/session.c b/xc/programs/xdm/session.c
index 12b97cc1d..5d0078adb 100644
--- a/xc/programs/xdm/session.c
+++ b/xc/programs/xdm/session.c
@@ -1,4 +1,4 @@
-/* $XConsortium: session.c,v 1.73 94/10/07 19:45:28 converse Exp $ */
+/* $XConsortium: session.c,v 1.74 94/10/17 18:26:13 converse Exp gildea $ */
 /*
 
 Copyright (c) 1988  X Consortium
@@ -169,7 +169,7 @@ AbortClient (pid)
     int pid;
 {
     int	sig = SIGTERM;
-#if __STDC__
+#ifdef __STDC__
     volatile int	i;
 #else
     int	i;
diff --git a/xc/programs/xfs/include/misc.h b/xc/programs/xfs/include/misc.h
index 518665699..6a1d8648c 100644
--- a/xc/programs/xfs/include/misc.h
+++ b/xc/programs/xfs/include/misc.h
@@ -1,4 +1,4 @@
-/* $XConsortium: misc.h,v 1.7 94/03/02 12:16:51 mor Exp $ */
+/* $XConsortium: misc.h,v 1.8 94/04/17 19:55:59 mor Exp gildea $ */
 /*
  
 Copyright (c) 1990, 1991  X Consortium
@@ -136,7 +136,7 @@ extern void FourByteInvert();
 extern long GetTimeInMillis();
 
 
-#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP)
+#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
 #define fsCat(x,y) x##_##y
 #else
 #define fsCat(x,y) x/**/_/**/y
diff --git a/xc/programs/xterm/TekPrsTbl.c b/xc/programs/xterm/TekPrsTbl.c
index 0105786a7..bcafe4d16 100644
--- a/xc/programs/xterm/TekPrsTbl.c
+++ b/xc/programs/xterm/TekPrsTbl.c
@@ -1,5 +1,5 @@
 /*
- *	$XConsortium: TekPrsTbl.c,v 1.6 91/05/08 17:29:08 gildea Exp $
+ *	$XConsortium: TekPrsTbl.c,v 1.7 91/05/29 18:06:16 gildea Exp gildea $
  */
 
 
@@ -28,7 +28,7 @@
 
 #include "Tekparse.h"
 
-#if __STDC__
+#ifdef __STDC__
 #define Const const
 #else
 #define Const /**/
-- 
cgit v1.2.3