X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=includes%2Fstdint.h;h=3516b96384637634a80c0e28869a59e0a112ac67;hb=3a988bf47bda2322d7759d3c4518c03e0ef98ba4;hp=07a161af21c819274a939ef3250755de428a5ab2;hpb=b08f4b52b1cd1f7a9553c0f357a7c90859fa3e73;p=pdclib

diff --git a/includes/stdint.h b/includes/stdint.h
index 07a161a..3516b96 100644
--- a/includes/stdint.h
+++ b/includes/stdint.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* 7.18 Integer types <stdint.h>
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -8,11 +6,7 @@
 
 #ifndef _PDCLIB_STDINT_H
 #define _PDCLIB_STDINT_H _PDCLIB_STDINT_H
-
-#ifndef _PDCLIB_INT_H
-#define _PDCLIB_INT_H _PDCLIB_INT_H
 #include <_PDCLIB_int.h>
-#endif
 
 /* 7.18.1.1 Exact-width integer types. */
 
@@ -157,8 +151,11 @@ typedef _PDCLIB_uintmax_t uintmax_t;
 
 #define SIZE_MAX _PDCLIB_SIZE_MAX
 
+#ifndef _PDCLIB_WCHAR_MIN_MAX_DEFINED
+#define _PDCLIB_WCHAR_MIN_MAX_DEFINED
 #define WCHAR_MIN _PDCLIB_WCHAR_MIN
 #define WCHAR_MAX _PDCLIB_WCHAR_MAX
+#endif
 
 #define WINT_MIN _PDCLIB_WINT_MIN
 #define WINT_MAX _PDCLIB_WINT_MAX
@@ -187,17 +184,17 @@ typedef _PDCLIB_uintmax_t uintmax_t;
 
 /* Expand to an integer constant of specified value and type int_leastN_t */
 
-#define INT8_C( value )  concat( value, _PDCLIB_INT8_LITERAL )
-#define INT16_C( value ) concat( value, _PDCLIB_INT16_LITERAL )
-#define INT32_C( value ) concat( value, _PDCLIB_INT32_LITERAL )
-#define INT64_C( value ) concat( value, _PDCLIB_INT64_LITERAL )
+#define INT8_C( value )  value
+#define INT16_C( value ) value
+#define INT32_C( value ) _PDCLIB_concat( value, _PDCLIB_INT32_LITERAL )
+#define INT64_C( value ) _PDCLIB_concat( value, _PDCLIB_INT64_LITERAL )
 
 /* Expand to an integer constant of specified value and type uint_leastN_t */
 
-#define UINT8_C( value )  concat( value, _PDCLIB_UINT8_LITERAL )
-#define UINT16_C( value ) concat( value, _PDCLIB_UINT16_LITERAL )
-#define UINT32_C( value ) concat( value, _PDCLIB_UINT32_LITERAL )
-#define UINT64_C( value ) concat( value, _PDCLIB_UINT64_LITERAL )
+#define UINT8_C( value )  value
+#define UINT16_C( value ) value
+#define UINT32_C( value ) _PDCLIB_concat( value, _PDCLIB_UINT32_LITERAL )
+#define UINT64_C( value ) _PDCLIB_concat( value, _PDCLIB_UINT64_LITERAL )
 
 /* 7.18.4.2 Macros for greatest-width integer constants */