change #if __STDC__ to #ifdef __STDC__

so can pass -Xa instead of -Xc to SVR4 compilers.
See advisory message of 21 April 1995.

3 files changed, 12 insertions, 12 deletions

diff --git a/xc/include/Xfuncproto.h b/xc/include/Xfuncproto.h
index bee094b91..39c24fab3 100644
--- a/xc/include/Xfuncproto.h
+++ b/xc/include/Xfuncproto.h
@@ -1,4 +1,4 @@
-/* $XConsortium: Xfuncproto.h,v 1.7 91/05/13 20:49:21 rws Exp $ */
+/* $XConsortium: Xfuncproto.h,v 1.8 94/04/17 20:10:49 rws Exp gildea $ */
 /* 
  * 
 Copyright (c) 1989, 1991  X Consortium
@@ -32,7 +32,7 @@ in this Software without prior written authorization from the X Consortium.
 #define _XFUNCPROTO_H_
 
 #ifndef NeedFunctionPrototypes
-#if defined(FUNCPROTO) || __STDC__ || defined(__cplusplus) || defined(c_plusplus)
+#if defined(FUNCPROTO) || defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)
 #define NeedFunctionPrototypes 1
 #else
 #define NeedFunctionPrototypes 0
@@ -40,7 +40,7 @@ in this Software without prior written authorization from the X Consortium.
 #endif /* NeedFunctionPrototypes */
 
 #ifndef NeedVarargsPrototypes
-#if __STDC__ || defined(__cplusplus) || defined(c_plusplus) || (FUNCPROTO&2)
+#if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus) || (FUNCPROTO&2)
 #define NeedVarargsPrototypes 1
 #else
 #define NeedVarargsPrototypes 0
@@ -50,7 +50,7 @@ in this Software without prior written authorization from the X Consortium.
 #if NeedFunctionPrototypes
 
 #ifndef NeedNestedPrototypes
-#if __STDC__ || defined(__cplusplus) || defined(c_plusplus) || (FUNCPROTO&8)
+#if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus) || (FUNCPROTO&8)
 #define NeedNestedPrototypes 1
 #else
 #define NeedNestedPrototypes 0
@@ -58,7 +58,7 @@ in this Software without prior written authorization from the X Consortium.
 #endif /* NeedNestedPrototypes */
 
 #ifndef _Xconst
-#if __STDC__ || defined(__cplusplus) || defined(c_plusplus) || (FUNCPROTO&4)
+#if defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus) || (FUNCPROTO&4)
 #define _Xconst const
 #else
 #define _Xconst
diff --git a/xc/include/Xmd.h b/xc/include/Xmd.h
index 6cd3605ab..b0776adb7 100644
--- a/xc/include/Xmd.h
+++ b/xc/include/Xmd.h
@@ -47,7 +47,7 @@ SOFTWARE.
 ******************************************************************/
 #ifndef XMD_H
 #define XMD_H 1
-/* $XConsortium: Xmd.h,v 1.47 94/04/17 20:10:50 rws Exp kaleb $ */
+/* $XConsortium: Xmd.h,v 1.48 95/04/07 18:59:03 kaleb Exp gildea $ */
 /*
  *  Xmd.h: MACHINE DEPENDENT DECLARATIONS.
  */
@@ -90,7 +90,7 @@ SOFTWARE.
  * The extra indirection in the __STDC__ case is to get macro arguments to
  * expand correctly before the concatenation, rather than afterward.
  */
-#if ((__STDC__ || defined(__cplusplus) || defined(c_plusplus)) && !defined(UNIXCPP)) || defined(ANSICPP)
+#if ((defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)) && !defined(UNIXCPP)) || defined(ANSICPP)
 #define _SIZEOF(x) sz_##x
 #define SIZEOF(x) _SIZEOF(x)
 #else
@@ -111,7 +111,7 @@ typedef unsigned long CARD64;
 typedef unsigned int INT32;
 typedef unsigned int INT16;
 #else
-#if __STDC__
+#ifdef __STDC__
 typedef signed int INT32;
 typedef signed int INT16;
 #else
@@ -131,7 +131,7 @@ typedef long INT32;
 typedef short INT16;
 #endif
 
-#if __STDC__ || defined(sgi) || defined(AIXV3)
+#if defined(__STDC__) || defined(sgi) || defined(AIXV3)
 typedef signed char    INT8;
 #else
 typedef char           INT8;
diff --git a/xc/include/extensions/multibufst.h b/xc/include/extensions/multibufst.h
index 7d653ad92..75df36806 100644
--- a/xc/include/extensions/multibufst.h
+++ b/xc/include/extensions/multibufst.h
@@ -1,5 +1,5 @@
 /*
- * $XConsortium: multibufst.h,v 1.14 93/10/12 11:54:49 dpw Exp $
+ * $XConsortium: multibufst.h,v 1.15 94/04/17 20:11:22 dpw Exp gildea $
  *
 Copyright (c) 1989  X Consortium
 
@@ -37,7 +37,7 @@ in this Software without prior written authorization from the X Consortium.
 #include "input.h"
 #endif
 
-#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP)
+#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
 #define MbufGetReq(name,req,info) GetReq (name, req); \
 	req->reqType = info->codes->major_opcode; \
 	req->mbufReqType = X_##name;
@@ -304,7 +304,7 @@ typedef struct {
     pSTRUCT2->FUNC_NAME = tmpFn;					\
 }
 
-#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP)
+#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP)
 #define WRAP_SCREEN_FUNC(pSCREEN,pPRIV,FUNC_NAME, PRIV_FUNC_NAME)	\
 {									\
     if ((pPRIV->funcsWrapped & FUNC_NAME##Mask) == 0)			\