summaryrefslogtreecommitdiff
path: root/Xmd.h
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2009-06-12 12:39:06 -0400
committerAdam Jackson <ajax@redhat.com>2009-06-12 12:39:06 -0400
commit74d18e89a3a315ae9ee4fb3efcaf515abd339b1d (patch)
treee5e0da47d2387ba879f01ec5b1c44b268a1abfcc /Xmd.h
parentbab9c572cd4dc916ff0acab99de8bb526212d77f (diff)
__STDC__ is always defined in C89.
Diffstat (limited to 'Xmd.h')
-rw-r--r--Xmd.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/Xmd.h b/Xmd.h
index 80e2947..768b68d 100644
--- a/Xmd.h
+++ b/Xmd.h
@@ -91,7 +91,7 @@ SOFTWARE.
* The extra indirection in the __STDC__ case is to get macro arguments to
* expand correctly before the concatenation, rather than afterward.
*/
-#if ((defined(__STDC__) || defined(__cplusplus) || defined(c_plusplus)) && !defined(UNIXCPP)) || defined(ANSICPP)
+#if !defined(UNIXCPP) || defined(ANSICPP)
#define _SIZEOF(x) sz_##x
#define SIZEOF(x) _SIZEOF(x)
#else
@@ -112,13 +112,8 @@ typedef unsigned long CARD64;
typedef unsigned int INT32;
typedef unsigned int INT16;
#else
-#ifdef __STDC__
typedef signed int INT32;
typedef signed int INT16;
-#else
-typedef int INT32;
-typedef int INT16;
-#endif
#endif
#else
#define B32
@@ -132,11 +127,7 @@ typedef long INT32;
typedef short INT16;
#endif
-#if defined(__STDC__)
typedef signed char INT8;
-#else
-typedef char INT8;
-#endif
#ifdef LONG64
typedef unsigned long CARD64;