summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/mfb/mergerop.h
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/mfb/mergerop.h')
-rw-r--r--xc/programs/Xserver/mfb/mergerop.h4
1 files changed, 2 insertions, 2 deletions
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