diff options
| -rw-r--r-- | xc/include/Xmd.h | 4 | ||||
| -rw-r--r-- | xc/programs/Xserver/cfb/cfbrrop.h | 4 | ||||
| -rw-r--r-- | xc/programs/Xserver/mfb/mergerop.h | 4 | ||||
| -rw-r--r-- | xc/programs/xdm/session.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/xc/include/Xmd.h b/xc/include/Xmd.h index d1cbcb2fa..4d4b6f334 100644 --- a/xc/include/Xmd.h +++ b/xc/include/Xmd.h @@ -23,7 +23,7 @@ SOFTWARE. ******************************************************************/ #ifndef XMD_H #define XMD_H 1 -/* $XConsortium: Xmd.h,v 1.35 89/08/15 14:38:57 jim Exp $ */ +/* $XConsortium: Xmd.h,v 1.36 90/03/14 12:15:16 jim Exp $ */ /* * Xmd.h: MACHINE DEPENDENT DECLARATIONS. */ @@ -57,7 +57,7 @@ SOFTWARE. * symbols are no more than 32 characters long (which causes problems for some * compilers and preprocessors). */ -#if defined(__STDC__) && !defined(UNIXCPP) +#if __STDC__ && !defined(UNIXCPP) #define SIZEOF(x) sz_##x #else #define SIZEOF(x) sz_/**/x diff --git a/xc/programs/Xserver/cfb/cfbrrop.h b/xc/programs/Xserver/cfb/cfbrrop.h index 739623a02..1c28d4d12 100644 --- a/xc/programs/Xserver/cfb/cfbrrop.h +++ b/xc/programs/Xserver/cfb/cfbrrop.h @@ -1,5 +1,5 @@ /* - * $XConsortium: cfbrrop.h,v 1.3 90/11/19 17:29:25 keith Exp $ + * $XConsortium: cfbrrop.h,v 1.4 90/11/29 19:34:07 keith Exp $ * * Copyright 1989 Massachusetts Institute of Technology * @@ -128,7 +128,7 @@ } #endif -#if defined(__STDC__) && !defined(UNIXCPP) +#if __STDC__ && !defined(UNIXCPP) #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 2525b1bd6..41479303f 100644 --- a/xc/programs/Xserver/mfb/mergerop.h +++ b/xc/programs/Xserver/mfb/mergerop.h @@ -1,5 +1,5 @@ /* - * $XConsortium: mergerop.h,v 1.4 90/04/01 17:22:39 rws Exp $ + * $XConsortium: mergerop.h,v 1.5 90/04/06 10:04:59 rws Exp $ * * Copyright 1989 Massachusetts Institute of Technology * @@ -152,7 +152,7 @@ extern mergeRopRec mergeRopBits[16]; #define MROP_NAME(prefix) MROP_NAME_CAT(prefix,General) #endif -#if defined(__STDC__) && !defined(UNIXCPP) +#if __STDC__ && !defined(UNIXCPP) #define MROP_NAME_CAT(prefix,suffix) prefix##suffix #else #define MROP_NAME_CAT(prefix,suffix) prefix/**/suffix diff --git a/xc/programs/xdm/session.c b/xc/programs/xdm/session.c index 4d54c24fa..ac044a7cb 100644 --- a/xc/programs/xdm/session.c +++ b/xc/programs/xdm/session.c @@ -1,7 +1,7 @@ /* * xdm - display manager daemon * - * $XConsortium: session.c,v 1.38 90/11/29 20:02:59 keith Exp $ + * $XConsortium: session.c,v 1.39 90/12/10 15:45:38 keith Exp $ * * Copyright 1988 Massachusetts Institute of Technology * @@ -407,7 +407,7 @@ AbortClient (pid) int pid; { int sig = SIGTERM; -#ifdef __STDC__ +#if __STDC__ volatile int i; #else int i; |