diff options
| author | gildea <empty> | 1995-06-08 23:20:39 +0000 |
|---|---|---|
| committer | gildea <empty> | 1995-06-08 23:20:39 +0000 |
| commit | c7f21c05b01c7dc3dee980256330d935e9c9e307 (patch) | |
| tree | 70cb9dc0889570a9be0a4a0099aec4464669155e /xc | |
| parent | 4c05b4a8267845e6db445270eeee0c04243737d4 (diff) | |
change #if __STDC__ to #ifdef __STDC__
so can pass -Xa instead of -Xc to SVR4 compilers.
See advisory message of 21 April 1995.
Diffstat (limited to 'xc')
61 files changed, 168 insertions, 163 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) \ diff --git a/xc/lib/FS/FSlibint.h b/xc/lib/FS/FSlibint.h index 02ee590ee..4802b4e5d 100644 --- a/xc/lib/FS/FSlibint.h +++ b/xc/lib/FS/FSlibint.h @@ -1,4 +1,4 @@ -/* $XConsortium: FSlibint.h,v 1.11 94/02/04 09:15:59 gildea Exp $ */ +/* $XConsortium: FSlibint.h,v 1.12 94/04/17 20:15:22 gildea Exp gildea $ */ /* * Copyright 1990 Network Computing Devices; @@ -132,7 +132,7 @@ extern void _FSEatData(); * */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define GetReq(name, req) \ WORD64ALIGN\ if ((svr->bufptr + SIZEOF(fs##name##Req)) > svr->bufmax)\ @@ -159,7 +159,7 @@ extern void _FSEatData(); /* GetReqExtra is the same as GetReq, but allocates "n" additional bytes after the request. "n" must be a multiple of 4! */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define GetReqExtra(name, n, req) \ WORD64ALIGN\ if ((svr->bufptr + SIZEOF(fs##name##Req) + n) > svr->bufmax)\ @@ -188,7 +188,7 @@ extern void _FSEatData(); * "rid" is the name of the resource. */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define GetResReq(name, rid, req) \ WORD64ALIGN\ if ((svr->bufptr + SIZEOF(fsResourceReq)) > svr->bufmax)\ @@ -217,7 +217,7 @@ extern void _FSEatData(); * at all. */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define GetEmptyReq(name, req) \ WORD64ALIGN\ if ((svr->bufptr + SIZEOF(fsReq)) > svr->bufmax)\ @@ -327,7 +327,7 @@ extern void Data(); * don't line up with proto */ -#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/lib/PEX5/PEXlibint.h b/xc/lib/PEX5/PEXlibint.h index 44d5b649e..c0b24ecee 100644 --- a/xc/lib/PEX5/PEXlibint.h +++ b/xc/lib/PEX5/PEXlibint.h @@ -1,4 +1,4 @@ -/* $XConsortium: PEXlibint.h,v 1.16 94/04/02 21:42:43 rws Exp $ */ +/* $XConsortium: PEXlibint.h,v 1.17 94/04/17 20:22:24 rws Exp gildea $ */ /****************************************************************************** @@ -270,7 +270,7 @@ typedef struct pexOCRequestHeader * Request names and opcodes. */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define REQNAME(_name_) pex##_name_##Req #define REQOPCODE(_name_) PEXRC##_name_ #define REQSIZE(_name_) sz_pex##_name_##Req diff --git a/xc/lib/PEX5/pl_extract.h b/xc/lib/PEX5/pl_extract.h index 618230588..824b6ca6f 100644 --- a/xc/lib/PEX5/pl_extract.h +++ b/xc/lib/PEX5/pl_extract.h @@ -1,4 +1,4 @@ -/* $XConsortium: pl_extract.h,v 1.3 93/09/23 14:39:44 mor Exp $ */ +/* $XConsortium: pl_extract.h,v 1.4 94/04/17 20:22:29 mor Exp gildea $ */ /* Copyright (c) 1992 X Consortium @@ -246,7 +246,7 @@ from the X Consortium. /* ------------------------------------------------------------------------ */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define GET_TEMP(_pexType, _tFoo, _foo) GET_TEMP_##_pexType (_tFoo, _foo); #else #define GET_TEMP(_pexType, _tFoo, _foo) GET_TEMP_/**/_pexType (_tFoo, _foo); @@ -398,7 +398,7 @@ from the X Consortium. /* EXTRACT_FOOFP and EXTRACT_LISTOF_FOOFP */ /* ------------------------------------------------------------------------ */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define DOEXTRACT(_pexType, _src, _dst, _fpConvert, _fpFormat) \ DOEXTRACT_##_pexType (_src, _dst, _fpConvert, _fpFormat) #else diff --git a/xc/lib/PEX5/pl_oc_util.h b/xc/lib/PEX5/pl_oc_util.h index ae4ccdee9..c5d4e8ffd 100644 --- a/xc/lib/PEX5/pl_oc_util.h +++ b/xc/lib/PEX5/pl_oc_util.h @@ -1,4 +1,4 @@ -/* $XConsortium: pl_oc_util.h,v 1.10 93/09/23 12:42:07 mor Exp $ */ +/* $XConsortium: pl_oc_util.h,v 1.11 94/04/17 20:22:42 mor Exp gildea $ */ /****************************************************************************** @@ -217,7 +217,7 @@ SOFTWARE. * Output Command names and opcodes. */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define OCNAME(_name_) pex##_name_ #define OCOPCODE(_name_) PEXOC##_name_ #define OCSIZE(_name_) sz_pex##_name_ @@ -464,7 +464,7 @@ SOFTWARE. * Generic macros to store OC data. * ------------------------------------------------------------------------- */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define STORE_LIST(_name, _count, _pList, _pBuf) \ STORE_LISTOF_##_name (_count, _pList, _pBuf) diff --git a/xc/lib/PEX5/pl_store.h b/xc/lib/PEX5/pl_store.h index f8246db30..1635b6cf6 100644 --- a/xc/lib/PEX5/pl_store.h +++ b/xc/lib/PEX5/pl_store.h @@ -1,4 +1,4 @@ -/* $XConsortium: pl_store.h,v 1.2 93/09/23 12:42:10 mor Exp $ */ +/* $XConsortium: pl_store.h,v 1.3 94/04/17 20:22:46 mor Exp gildea $ */ /* Copyright (c) 1992 X Consortium @@ -213,7 +213,7 @@ from the X Consortium. /* ------------------------------------------------------------------------ */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define PUT_TEMP(_pexType, _foo, _tFoo) PUT_TEMP_##_pexType (_foo, _tFoo); #else #define PUT_TEMP(_pexType, _foo, _tFoo) PUT_TEMP_/**/_pexType (_foo, _tFoo); @@ -341,7 +341,7 @@ from the X Consortium. /* STORE_FOOFP and STORE_LISTOF_FOOFP */ /* ------------------------------------------------------------------------ */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define DOSTORE(_pexType, _src, _dst, _fpConvert, _fpFormat) \ DOSTORE_##_pexType (_src, _dst, _fpConvert, _fpFormat) #else diff --git a/xc/lib/X11/ChkMaskEv.c b/xc/lib/X11/ChkMaskEv.c index 183dffdea..30f2fe594 100644 --- a/xc/lib/X11/ChkMaskEv.c +++ b/xc/lib/X11/ChkMaskEv.c @@ -1,4 +1,4 @@ -/* $XConsortium: ChkMaskEv.c,v 11.24 93/01/28 13:16:50 gildea Exp $ */ +/* $XConsortium: ChkMaskEv.c,v 11.25 94/04/17 20:18:46 gildea Exp gildea $ */ /* Copyright (c) 1985, 1987 X Consortium @@ -29,7 +29,7 @@ in this Software without prior written authorization from the X Consortium. #define NEED_EVENTS #include "Xlibint.h" -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/X11/ChkWinEv.c b/xc/lib/X11/ChkWinEv.c index 01abcacd5..13e5095ae 100644 --- a/xc/lib/X11/ChkWinEv.c +++ b/xc/lib/X11/ChkWinEv.c @@ -1,4 +1,4 @@ -/* $XConsortium: ChkWinEv.c,v 11.22 93/01/28 13:16:51 gildea Exp $ */ +/* $XConsortium: ChkWinEv.c,v 11.23 94/04/17 20:18:48 gildea Exp gildea $ */ /* Copyright (c) 1985, 1987 X Consortium @@ -29,7 +29,7 @@ in this Software without prior written authorization from the X Consortium. #define NEED_EVENTS #include "Xlibint.h" -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/X11/CrGC.c b/xc/lib/X11/CrGC.c index 67f085ac0..6f400513a 100644 --- a/xc/lib/X11/CrGC.c +++ b/xc/lib/X11/CrGC.c @@ -1,4 +1,4 @@ -/* $XConsortium: CrGC.c,v 11.41 93/11/05 11:12:52 kaleb Exp $ */ +/* $XConsortium: CrGC.c,v 11.42 94/04/17 20:18:59 kaleb Exp gildea $ */ /* Copyright (c) 1986 X Consortium @@ -28,7 +28,7 @@ in this Software without prior written authorization from the X Consortium. #include "Xlibint.h" -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/X11/ErrDes.c b/xc/lib/X11/ErrDes.c index eb059b40f..001a157c6 100644 --- a/xc/lib/X11/ErrDes.c +++ b/xc/lib/X11/ErrDes.c @@ -1,5 +1,5 @@ /* - * $XConsortium: ErrDes.c,v 11.52 93/12/09 15:02:32 kaleb Exp $ + * $XConsortium: ErrDes.c,v 11.53 94/04/17 20:19:14 kaleb Exp gildea $ */ /*********************************************************** @@ -59,7 +59,7 @@ SOFTWARE. #define ERRORDB "/usr/lib/X11/XErrorDB" #endif -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/X11/FilterEv.c b/xc/lib/X11/FilterEv.c index a8bd37a72..507e5abb0 100644 --- a/xc/lib/X11/FilterEv.c +++ b/xc/lib/X11/FilterEv.c @@ -1,4 +1,4 @@ -/* $XConsortium: FilterEv.c,v 1.8 91/06/05 09:15:44 rws Exp $ */ +/* $XConsortium: FilterEv.c,v 1.9 94/04/17 20:19:21 rws Exp gildea $ */ /* * Copyright 1990, 1991 by OMRON Corporation @@ -60,7 +60,7 @@ from the X Consortium. #include "Xlibint.h" #include "Xlcint.h" -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/X11/ImUtil.c b/xc/lib/X11/ImUtil.c index d376565f2..824877999 100644 --- a/xc/lib/X11/ImUtil.c +++ b/xc/lib/X11/ImUtil.c @@ -1,4 +1,4 @@ -/* $XConsortium: ImUtil.c,v 11.59 93/11/05 11:12:58 kaleb Exp $ */ +/* $XConsortium: ImUtil.c,v 11.60 94/04/17 20:19:59 kaleb Exp gildea $ */ /* Copyright (c) 1986 X Consortium @@ -30,7 +30,7 @@ in this Software without prior written authorization from the X Consortium. #include <X11/Xutil.h> #include <stdio.h> -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/X11/KeysymStr.c b/xc/lib/X11/KeysymStr.c index d08d84911..382f94274 100644 --- a/xc/lib/X11/KeysymStr.c +++ b/xc/lib/X11/KeysymStr.c @@ -1,4 +1,4 @@ -/* $XConsortium: KeysymStr.c,v 11.8 93/08/14 18:33:20 rws Exp $ */ +/* $XConsortium: KeysymStr.c,v 11.9 94/04/17 20:20:03 rws Exp gildea $ */ /* @@ -31,7 +31,7 @@ in this Software without prior written authorization from the X Consortium. #include <X11/Xresource.h> #include <X11/keysymdef.h> -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/X11/LRGB.c b/xc/lib/X11/LRGB.c index b2c617e44..1132cff49 100644 --- a/xc/lib/X11/LRGB.c +++ b/xc/lib/X11/LRGB.c @@ -1,4 +1,4 @@ -/* $XConsortium: LRGB.c,v 1.30 94/06/03 17:51:49 rws Exp converse $" */ +/* $XConsortium: LRGB.c,v 1.31 95/05/31 20:47:35 converse Exp gildea $" */ /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. @@ -42,7 +42,7 @@ #include "Xlibint.h" #include "Xcmsint.h" -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/X11/MaskEvent.c b/xc/lib/X11/MaskEvent.c index c5dd25038..1e46174c8 100644 --- a/xc/lib/X11/MaskEvent.c +++ b/xc/lib/X11/MaskEvent.c @@ -1,4 +1,4 @@ -/* $XConsortium: MaskEvent.c,v 11.24 93/11/05 11:13:03 kaleb Exp $ */ +/* $XConsortium: MaskEvent.c,v 11.25 94/04/17 20:20:17 kaleb Exp gildea $ */ /* Copyright (c) 1986 X Consortium @@ -29,7 +29,7 @@ in this Software without prior written authorization from the X Consortium. #define NEED_EVENTS #include "Xlibint.h" -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/X11/PutImage.c b/xc/lib/X11/PutImage.c index c580de88f..97fdef996 100644 --- a/xc/lib/X11/PutImage.c +++ b/xc/lib/X11/PutImage.c @@ -1,4 +1,4 @@ -/* $XConsortium: PutImage.c,v 11.69 93/11/05 11:13:09 kaleb Exp $ */ +/* $XConsortium: PutImage.c,v 11.70 94/04/17 20:20:31 kaleb Exp gildea $ */ /* Copyright (c) 1986 X Consortium @@ -30,12 +30,12 @@ in this Software without prior written authorization from the X Consortium. #include "Xutil.h" #include <stdio.h> -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ #endif -#if __STDC__ && ((defined(sun) && defined(SVR4)) || defined(WIN32)) +#if defined(__STDC__) && ((defined(sun) && defined(SVR4)) || defined(WIN32)) #define RConst /**/ #else #define RConst Const @@ -128,7 +128,7 @@ _XReverse_Bytes (bpt, nb) /* XXX the following functions are declared int instead of void because various - * compilers and lints complain about later intialization of SwapFunc and/or + * compilers and lints complain about later initialization of SwapFunc and/or * (swapfunc == NoSwap) when void is used. */ @@ -577,7 +577,7 @@ static int Const HalfOrderWord[12] = { /* Cancel a GetReq operation, before doing _XSend or Data */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define UnGetReq(name)\ dpy->bufptr -= SIZEOF(x##name##Req);\ dpy->request-- diff --git a/xc/lib/X11/StrKeysym.c b/xc/lib/X11/StrKeysym.c index de537c573..d64c32edd 100644 --- a/xc/lib/X11/StrKeysym.c +++ b/xc/lib/X11/StrKeysym.c @@ -1,4 +1,4 @@ -/* $XConsortium: StrKeysym.c,v 11.15 91/06/07 18:20:55 rws Exp $ */ +/* $XConsortium: StrKeysym.c,v 11.16 94/04/17 20:21:13 rws Exp gildea $ */ /* Copyright (c) 1985, 1987, 1990 X Consortium @@ -35,7 +35,7 @@ extern char *getenv(); extern XrmQuark _XrmInternalStringToQuark(); -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/X11/WinEvent.c b/xc/lib/X11/WinEvent.c index f6e87ed31..dec28c99a 100644 --- a/xc/lib/X11/WinEvent.c +++ b/xc/lib/X11/WinEvent.c @@ -1,4 +1,4 @@ -/* $XConsortium: WinEvent.c,v 11.21 93/11/05 11:13:24 kaleb Exp $ */ +/* $XConsortium: WinEvent.c,v 11.22 94/04/17 20:21:30 kaleb Exp gildea $ */ /* Copyright (c) 1985 X Consortium @@ -29,7 +29,7 @@ in this Software without prior written authorization from the X Consortium. #define NEED_EVENTS #include "Xlibint.h" -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/X11/XKBCvt.c b/xc/lib/X11/XKBCvt.c index 0a33680fe..3a3c9e6da 100644 --- a/xc/lib/X11/XKBCvt.c +++ b/xc/lib/X11/XKBCvt.c @@ -1,4 +1,4 @@ -/* "$XConsortium: XKBCvt.c,v 1.13 94/04/02 17:26:19 erik Exp $"; */ +/* "$XConsortium: XKBCvt.c,v 1.14 94/04/17 20:21:35 erik Exp gildea $"; */ /* Copyright (c) 1988, 1989 X Consortium @@ -52,12 +52,12 @@ from the X Consortium. extern char *getenv(); #endif -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ #endif -#if __STDC__ && !defined(NORCONST) +#if defined(__STDC__) && !defined(NORCONST) #define RConst const #else #define RConst /**/ diff --git a/xc/lib/X11/XRGB.c b/xc/lib/X11/XRGB.c index dc531a333..dcf7c4acc 100644 --- a/xc/lib/X11/XRGB.c +++ b/xc/lib/X11/XRGB.c @@ -1,4 +1,4 @@ -/* $XConsortium: XcmsXRGB.c,v 1.4 91/05/13 23:30:24 rws Exp $" */ +/* $XConsortium: XRGB.c,v 1.5 91/07/22 15:53:56 rws Exp gildea $" */ /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. @@ -37,7 +37,7 @@ #include "Xlibint.h" #include "Xcmsint.h" -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/X11/Xcmsint.h b/xc/lib/X11/Xcmsint.h index 95e74055e..f6ef8a941 100644 --- a/xc/lib/X11/Xcmsint.h +++ b/xc/lib/X11/Xcmsint.h @@ -1,4 +1,4 @@ -/* $XConsortium: Xcmsint.h,v 1.17 91/11/05 11:06:51 rws Exp $ */ +/* $XConsortium: Xcmsint.h,v 1.18 92/06/05 16:47:53 converse Exp gildea $ */ /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. @@ -194,7 +194,7 @@ typedef struct { #define XCMS_SQRT(x) _XcmsSquareRoot(x) #define XCMS_TAN(x) (XCMS_SIN(x) / XCMS_COS(x)) -#if __STDC__ +#ifdef __STDC__ double _XcmsArcTangent(double a); double _XcmsCosine(double a); double _XcmsCubeRoot(double a); diff --git a/xc/lib/X11/Xlibint.h b/xc/lib/X11/Xlibint.h index 9e372cdb7..f5795c1b9 100644 --- a/xc/lib/X11/Xlibint.h +++ b/xc/lib/X11/Xlibint.h @@ -1,4 +1,4 @@ -/* $XConsortium: Xlibint.h,v 11.144 95/04/05 19:57:54 kaleb Exp gildea $ */ +/* $XConsortium: Xlibint.h,v 11.145 95/06/02 23:42:52 gildea Exp gildea $ */ /* @@ -407,7 +407,7 @@ extern int errno; /* Internal system error number. */ * */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define GetReq(name, req) \ WORD64ALIGN\ if ((dpy->bufptr + SIZEOF(x##name##Req)) > dpy->bufmax)\ @@ -433,7 +433,7 @@ extern int errno; /* Internal system error number. */ /* GetReqExtra is the same as GetReq, but allocates "n" additional bytes after the request. "n" must be a multiple of 4! */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define GetReqExtra(name, n, req) \ WORD64ALIGN\ if ((dpy->bufptr + SIZEOF(x##name##Req) + n) > dpy->bufmax)\ @@ -462,7 +462,7 @@ extern int errno; /* Internal system error number. */ * "rid" is the name of the resource. */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define GetResReq(name, rid, req) \ WORD64ALIGN\ if ((dpy->bufptr + SIZEOF(xResourceReq)) > dpy->bufmax)\ @@ -490,7 +490,7 @@ extern int errno; /* Internal system error number. */ * GetEmptyReq is for those requests that have no arguments * at all. */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define GetEmptyReq(name, req) \ WORD64ALIGN\ if ((dpy->bufptr + SIZEOF(xReq)) > dpy->bufmax)\ diff --git a/xc/lib/X11/Xrm.c b/xc/lib/X11/Xrm.c index 5bfc21f28..e3da1d46c 100644 --- a/xc/lib/X11/Xrm.c +++ b/xc/lib/X11/Xrm.c @@ -1,4 +1,4 @@ -/* $XConsortium: Xrm.c,v 1.87 94/04/01 12:25:54 rws Exp $ */ +/* $XConsortium: Xrm.c,v 1.88 94/04/17 20:21:54 rws Exp gildea $ */ /*********************************************************** Copyright 1987, 1988, 1990 by Digital Equipment Corporation, Maynard @@ -63,12 +63,12 @@ from the X Consortium. #include "XrmI.h" #include <X11/Xos.h> -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ #endif -#if __STDC__ && !defined(NORCONST) +#if defined(__STDC__) && !defined(NORCONST) #define RConst const #else #define RConst /**/ diff --git a/xc/lib/X11/cmsColNm.c b/xc/lib/X11/cmsColNm.c index bc24dc819..c92c2897a 100644 --- a/xc/lib/X11/cmsColNm.c +++ b/xc/lib/X11/cmsColNm.c @@ -1,4 +1,4 @@ -/* $XConsortium: cmsColNm.c,v 1.28 94/03/31 21:50:05 rws Exp converse $" */ +/* $XConsortium: cmsColNm.c,v 1.29 95/03/31 18:18:54 converse Exp gildea $" */ /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. @@ -251,7 +251,7 @@ _XcmsParseColorString(ccc, color_string, pColor) */ static int FirstCmp(p1, p2) -#if __STDC__ +#ifdef __STDC__ const void *p1, *p2; #else XcmsPair *p1, *p2; diff --git a/xc/lib/X11/cmsMath.c b/xc/lib/X11/cmsMath.c index bc5cc17c6..0c13c3a5b 100644 --- a/xc/lib/X11/cmsMath.c +++ b/xc/lib/X11/cmsMath.c @@ -1,4 +1,4 @@ -/* $XConsortium: cmsMath.c,v 1.9 94/01/01 14:53:59 rws Exp $ */ +/* $XConsortium: cmsMath.c,v 1.10 94/04/17 20:21:59 rws Exp gildea $ */ /* @@ -34,7 +34,7 @@ in this Software without prior written authorization from the X Consortium. #include "Xlibint.h" #include "Xcmsint.h" -#if !defined(X_NOT_STDC_ENV) && (__STDC__ || !(defined(sun) || (defined(sony) && !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV)))) +#if !defined(X_NOT_STDC_ENV) && (defined(__STDC__) || !(defined(sun) || (defined(sony) && !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV)))) #include <float.h> #endif #ifndef DBL_EPSILON diff --git a/xc/lib/X11/cmsTrig.c b/xc/lib/X11/cmsTrig.c index 6fc6ab178..4a0f925a1 100644 --- a/xc/lib/X11/cmsTrig.c +++ b/xc/lib/X11/cmsTrig.c @@ -1,4 +1,4 @@ -/* $XConsortium: cmsTrig.c,v 1.5 92/11/19 14:59:55 rws Exp $" */ +/* $XConsortium: cmsTrig.c,v 1.6 94/02/10 20:10:00 rws Exp gildea $" */ /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. @@ -63,7 +63,7 @@ double _XcmsArcTangent(); * DEFINES */ -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/X11/evtomask.c b/xc/lib/X11/evtomask.c index 8c7380e67..375ba6bc3 100644 --- a/xc/lib/X11/evtomask.c +++ b/xc/lib/X11/evtomask.c @@ -1,4 +1,4 @@ -/* $XConsortium: evtomask.c,v 1.8 91/02/20 18:49:00 rws Exp $ */ +/* $XConsortium: evtomask.c,v 1.9 94/04/17 20:22:01 rws Exp gildea $ */ /* Copyright (c) 1987 X Consortium @@ -28,7 +28,7 @@ in this Software without prior written authorization from the X Consortium. #include <X11/X.h> -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/X11/globals.c b/xc/lib/X11/globals.c index 9be2cd236..fc4a25bbd 100644 --- a/xc/lib/X11/globals.c +++ b/xc/lib/X11/globals.c @@ -1,4 +1,4 @@ -/* $XConsortium: globals.c,v 1.17 94/03/30 21:59:30 rws Exp $ */ +/* $XConsortium: globals.c,v 1.18 94/04/17 20:22:01 rws Exp gildea $ */ /* Copyright (c) 1989 X Consortium @@ -55,7 +55,7 @@ from the X Consortium. /* * If we need to define extra variables for each global */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define ZEROINIT(t,var,val) SetZero(t,var,val); \ SetZero (long, _libX_##var##Flag, 0); \ SetZero (void *, _libX_##var##Ptr, NULL) diff --git a/xc/lib/X11/imCallbk.c b/xc/lib/X11/imCallbk.c index 51fafade8..933f69f2c 100644 --- a/xc/lib/X11/imCallbk.c +++ b/xc/lib/X11/imCallbk.c @@ -1,4 +1,4 @@ -/* $XConsortium: imCallbk.c,v 1.11 95/05/22 19:18:11 kaleb Exp kaleb $ */ +/* $XConsortium: imCallbk.c,v 1.12 95/05/22 19:38:09 kaleb Exp gildea $ */ /*********************************************************************** Copyright 1993 by Digital Equipment Corporation, Maynard, Massachusetts, Copyright 1994 by FUJITSU LIMITED @@ -116,12 +116,12 @@ Private XimCbStatus _XimStatusDrawCallback(); Private XimCbStatus _XimPreeditStateNotifyCallback(); #endif /* NeedFunctionPrototypes */ -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ #endif -#if __STDC__ && ((defined(sun) && defined(SVR4)) || defined(WIN32)) +#if defined(__STDC__) && ((defined(sun) && defined(SVR4)) || defined(WIN32)) #define RConst /**/ #else #define RConst Const diff --git a/xc/lib/X11/lcWrap.c b/xc/lib/X11/lcWrap.c index 79b404f4a..55dd21c0e 100644 --- a/xc/lib/X11/lcWrap.c +++ b/xc/lib/X11/lcWrap.c @@ -1,4 +1,4 @@ -/* $XConsortium: lcWrap.c,v 11.21 94/09/01 18:40:04 kaleb Exp kaleb $ */ +/* $XConsortium: lcWrap.c,v 11.22 95/05/11 22:16:09 kaleb Exp gildea $ */ /* Copyright (c) 1991 X Consortium @@ -65,7 +65,7 @@ from the X Consortium. #endif #include <X11/Xutil.h> -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/XIE/XIElibint.h b/xc/lib/XIE/XIElibint.h index 9f41b5224..f2298a4b2 100644 --- a/xc/lib/XIE/XIElibint.h +++ b/xc/lib/XIE/XIElibint.h @@ -1,4 +1,4 @@ -/* $XConsortium: XIElibint.h,v 1.6 94/04/02 22:58:56 rws Exp $ */ +/* $XConsortium: XIElibint.h,v 1.7 94/04/17 20:18:17 rws Exp gildea $ */ /* Copyright (c) 1993, 1994 X Consortium @@ -158,7 +158,7 @@ typedef struct _XieExtInfo * Request names and opcodes. */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define REQNAME(_name_) xie##_name_##Req #define REQOPCODE(_name_) X_ie##_name_ #define REQSIZE(_name_) sz_xie##_name_##Req diff --git a/xc/lib/XIE/elements.h b/xc/lib/XIE/elements.h index 192471a52..811122a42 100644 --- a/xc/lib/XIE/elements.h +++ b/xc/lib/XIE/elements.h @@ -1,4 +1,4 @@ -/* $XConsortium: elements.h,v 1.3 94/03/18 10:29:55 mor Exp $ */ +/* $XConsortium: elements.h,v 1.4 94/04/17 20:18:22 mor Exp gildea $ */ /* @@ -33,7 +33,7 @@ from the X Consortium. #ifndef _ELEMENTS_H_ #define _ELEMENTS_H_ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define ELEM_NAME(_name_) xieFlo##_name_ #define ELEM_SIZE(_name_) sz_xieFlo##_name_ #else diff --git a/xc/lib/Xext/globals.c b/xc/lib/Xext/globals.c index 24bd78401..a3d4def19 100644 --- a/xc/lib/Xext/globals.c +++ b/xc/lib/Xext/globals.c @@ -1,4 +1,4 @@ -/* $XConsortium: globals.c,v 1.3 93/08/17 18:06:43 rws Exp $ */ +/* $XConsortium: globals.c,v 1.4 94/04/17 20:22:58 rws Exp gildea $ */ /* Copyright (c) 1989 X Consortium @@ -54,7 +54,7 @@ from the X Consortium. /* * If we need to define extra variables for each global */ -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define ZEROINIT(t,var,val) SetZero(t,var,val); \ SetZero (long, _libX_##var##Flag, 0); \ SetZero (void *, _libX_##var##Ptr, NULL) diff --git a/xc/lib/Xmu/Atoms.c b/xc/lib/Xmu/Atoms.c index fd03b8bf1..417146c4e 100644 --- a/xc/lib/Xmu/Atoms.c +++ b/xc/lib/Xmu/Atoms.c @@ -1,4 +1,4 @@ -/* $XConsortium: Atoms.c,v 1.17 93/09/22 16:01:29 kaleb Exp $ */ +/* $XConsortium: Atoms.c,v 1.18 94/04/17 20:15:49 kaleb Exp gildea $ */ /* @@ -60,7 +60,7 @@ struct _AtomRec { #define STATIC static #endif -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define DeclareAtom(atom,text) \ STATIC struct _AtomRec __##atom = { text, NULL }; \ AtomPtr _##atom = &__##atom; diff --git a/xc/lib/Xmu/CursorName.c b/xc/lib/Xmu/CursorName.c index 89bd1f3aa..efb897c5c 100644 --- a/xc/lib/Xmu/CursorName.c +++ b/xc/lib/Xmu/CursorName.c @@ -1,4 +1,4 @@ -/* $XConsortium: CursorName.c,v 1.7 91/02/17 15:25:42 rws Exp $ */ +/* $XConsortium: CursorName.c,v 1.8 94/04/17 20:15:55 rws Exp gildea $ */ /* @@ -32,7 +32,7 @@ in this Software without prior written authorization from the X Consortium. #include <X11/Xmu/CurUtil.h> #include <X11/cursorfont.h> -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/Xmu/Lookup.c b/xc/lib/Xmu/Lookup.c index 17c6add29..e5df940f5 100644 --- a/xc/lib/Xmu/Lookup.c +++ b/xc/lib/Xmu/Lookup.c @@ -1,4 +1,4 @@ -/* $XConsortium: Lookup.c,v 1.13 94/03/27 13:15:23 rws Exp $ */ +/* $XConsortium: Lookup.c,v 1.14 94/04/17 20:16:10 rws Exp gildea $ */ /* @@ -33,7 +33,7 @@ in this Software without prior written authorization from the X Consortium. #define XK_PUBLISHING #include <X11/keysymdef.h> -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/Xmu/sharedlib.c b/xc/lib/Xmu/sharedlib.c index 3478dabab..bb299ea5e 100644 --- a/xc/lib/Xmu/sharedlib.c +++ b/xc/lib/Xmu/sharedlib.c @@ -1,4 +1,4 @@ -/* $XConsortium: sharedlib.c,v 1.7 93/02/08 10:45:09 rws Exp $ */ +/* $XConsortium: sharedlib.c,v 1.8 94/04/17 20:16:27 rws Exp gildea $ */ /* @@ -36,7 +36,7 @@ struct _AtomRec { struct _DisplayRec* head; }; -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define DeclareAtom(atom) \ extern struct _AtomRec __##atom; \ AtomPtr _##atom = &__##atom; diff --git a/xc/lib/Xt/Converters.c b/xc/lib/Xt/Converters.c index 78e6401e0..f1a72fd2a 100644 --- a/xc/lib/Xt/Converters.c +++ b/xc/lib/Xt/Converters.c @@ -1,4 +1,4 @@ -/* $XConsortium: Converters.c,v 1.99 94/04/17 20:13:50 rws Exp converse $ */ +/* $XConsortium: Converters.c,v 1.100 95/05/30 21:34:41 converse Exp gildea $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts @@ -76,7 +76,7 @@ in this Software without prior written authorization from the X Consortium. extern int errno; #endif -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/Xt/Event.c b/xc/lib/Xt/Event.c index 6fcc0ab33..3ab168cc1 100644 --- a/xc/lib/Xt/Event.c +++ b/xc/lib/Xt/Event.c @@ -1,4 +1,4 @@ -/* $XConsortium: Event.c,v 1.170 95/02/21 19:45:06 converse Exp converse $ */ +/* $XConsortium: Event.c,v 1.171 95/02/21 21:32:57 converse Exp gildea $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -64,7 +64,7 @@ in this Software without prior written authorization from the X Consortium. #include "Shell.h" #include "StringDefs.h" -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/Xt/Initialize.c b/xc/lib/Xt/Initialize.c index fbc2da069..b345929de 100644 --- a/xc/lib/Xt/Initialize.c +++ b/xc/lib/Xt/Initialize.c @@ -1,4 +1,4 @@ -/* $XConsortium: Initialize.c,v 1.221 94/11/30 16:23:20 kaleb Exp kaleb $ */ +/* $XConsortium: Initialize.c,v 1.222 94/12/12 18:59:11 kaleb Exp gildea $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts @@ -72,7 +72,7 @@ in this Software without prior written authorization from the X Consortium. #include <stdio.h> #include <X11/Xlocale.h> -#if __STDC__ +#ifdef __STDC__ #define Const const #else #define Const /**/ diff --git a/xc/lib/Xt/Intrinsic.h b/xc/lib/Xt/Intrinsic.h index 1faae1e46..cb3577e7e 100644 --- a/xc/lib/Xt/Intrinsic.h +++ b/xc/lib/Xt/Intrinsic.h @@ -1,4 +1,4 @@ -/* $XConsortium: Intrinsic.h,v 1.198 94/04/02 11:40:57 converse Exp $ */ +/* $XConsortium: Intrinsic.h,v 1.199 94/04/17 20:14:22 converse Exp gildea $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, @@ -751,7 +751,7 @@ extern void XtDisplayStringConversionWarning( #endif ); -#if __STDC__ +#ifdef __STDC__ externalref XtConvertArgRec const colorConvertArgs[]; externalref XtConvertArgRec const screenConvertArg[]; #else diff --git a/xc/lib/Xt/TMaction.c b/xc/lib/Xt/TMaction.c index 9904460d4..2fc182118 100644 --- a/xc/lib/Xt/TMaction.c +++ b/xc/lib/Xt/TMaction.c @@ -1,4 +1,4 @@ -/* $XConsortium: TMaction.c,v 1.24 93/10/06 17:38:43 kaleb Exp $ */ +/* $XConsortium: TMaction.c,v 1.25 94/04/17 20:14:50 kaleb Exp gildea $ */ /*LINTLIBRARY*/ /*********************************************************** @@ -68,7 +68,7 @@ in this Software without prior written authorization from the X Consortium. #include "IntrinsicI.h" #include "StringDefs.h" -#if __STDC__ && !defined(NORCONST) +#if defined(__STDC__) && !defined(NORCONST) #define RConst const #else #define RConst /**/ diff --git a/xc/lib/font/Speedo/speedo.h b/xc/lib/font/Speedo/speedo.h index 8af04b15d..57a8f4ec8 100644 --- a/xc/lib/font/Speedo/speedo.h +++ b/xc/lib/font/Speedo/speedo.h @@ -1,4 +1,4 @@ -/* $XConsortium: speedo.h,v 1.5 93/09/11 15:29:21 rws Exp $ */ +/* $XConsortium: speedo.h,v 1.6 94/02/07 10:00:41 gildea Exp gildea $ */ /* @@ -280,7 +280,7 @@ typedef struct specs_tag /* Bit 14: Clip top if set */ /* Bit 15: Clip bottom if set */ /* Bits 16-31 not used */ -#if __STDC__ +#ifdef __STDC__ void *out_info; /* information for output module */ #else char *out_info; diff --git a/xc/lib/font/Type1/spaces.c b/xc/lib/font/Type1/spaces.c index bcb7019bd..42cec278b 100644 --- a/xc/lib/font/Type1/spaces.c +++ b/xc/lib/font/Type1/spaces.c @@ -1,4 +1,4 @@ -/* $XConsortium: spaces.c,v 1.6 92/09/17 14:24:15 gildea Exp $ */ +/* $XConsortium: spaces.c,v 1.7 94/02/06 16:26:52 gildea Exp gildea $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 @@ -45,8 +45,8 @@ This module is responsible for handling the TYPE1IMAGER "XYspace" object. #include "arith.h" #include "trig.h" -static FindFfcn(); -static FindIfcn(); +static void FindFfcn(); +static void FindIfcn(); /* :h3.Entry Points Provided to the TYPE1IMAGER User */ @@ -183,7 +183,7 @@ static int nextcontext = 1; /*SHARED LINE(S) ORIGINATED HERE*/ -#if __STDC__ +#ifdef __STDC__ #define pointer void * #else #define pointer char * @@ -542,7 +542,7 @@ This function tests for the special case of one of the coefficients being zero: */ -static FindFfcn(cx, cy, fcnP) +static void FindFfcn(cx, cy, fcnP) register double cx,cy; /* x and y coefficients */ register fractpel (**fcnP)(); /* pointer to function to set */ { @@ -565,7 +565,7 @@ we store a NULL indicating that this we should do the conversion in floating point. */ -static FindIfcn(cx, cy, icxP, icyP, fcnP) +static void FindIfcn(cx, cy, icxP, icyP, fcnP) register double cx,cy; /* x and y coefficients */ register fractpel *icxP,*icyP; /* fixed point coefficients to set */ register fractpel (**fcnP)(); /* pointer to function to set */ diff --git a/xc/lib/xtrans/Xtrans.h b/xc/lib/xtrans/Xtrans.h index 8585889e0..b9c249a04 100644 --- a/xc/lib/xtrans/Xtrans.h +++ b/xc/lib/xtrans/Xtrans.h @@ -1,4 +1,4 @@ -/* $XConsortium: Xtrans.h,v 1.27 94/06/02 10:49:08 mor Exp mor $ */ +/* $XConsortium: Xtrans.h,v 1.28 94/10/18 15:57:42 mor Exp gildea $ */ /* Copyright (c) 1993, 1994 X Consortium @@ -64,7 +64,7 @@ from the X Consortium. */ #ifdef X11_t -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define TRANS(func) _X11Trans##func #else #define TRANS(func) _X11Trans/**/func @@ -72,7 +72,7 @@ from the X Consortium. #endif /* X11_t */ #ifdef XSERV_t -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define TRANS(func) _XSERVTrans##func #else #define TRANS(func) _XSERVTrans/**/func @@ -81,7 +81,7 @@ from the X Consortium. #endif /* X11_t */ #ifdef XIM_t -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define TRANS(func) _XimXTrans##func #else #define TRANS(func) _XimXTrans/**/func @@ -89,7 +89,7 @@ from the X Consortium. #endif /* XIM_t */ #ifdef FS_t -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define TRANS(func) _FSTrans##func #else #define TRANS(func) _FSTrans/**/func @@ -97,7 +97,7 @@ from the X Consortium. #endif /* FS_t */ #ifdef FONT_t -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define TRANS(func) _FontTrans##func #else #define TRANS(func) _FontTrans/**/func @@ -105,7 +105,7 @@ from the X Consortium. #endif /* FONT_t */ #ifdef ICE_t -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define TRANS(func) _IceTrans##func #else #define TRANS(func) _IceTrans/**/func @@ -113,7 +113,7 @@ from the X Consortium. #endif /* ICE_t */ #ifdef TEST_t -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define TRANS(func) _TESTTrans##func #else #define TRANS(func) _TESTTrans/**/func @@ -121,7 +121,7 @@ from the X Consortium. #endif /* TEST_t */ #if !defined(TRANS) -#if (__STDC__ && !defined(UNIXCPP)) || defined(ANSICPP) +#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define TRANS(func) _XTrans##func #else #define TRANS(func) _XTrans/**/func 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 /**/ |