X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=_PDCLIB_int.h;h=3192823dd11f171be1ceec0fd6869a96d8ab5c9b;hb=f8f594c924dad6e143c555f94de3531d630b1da0;hp=af65596f89b49876eed8d39c42232eeb8d32d594;hpb=89c516d1b45766b519f60b986366a3c592ec5760;p=pdclib

diff --git a/_PDCLIB_int.h b/_PDCLIB_int.h
index af65596..3192823 100644
--- a/_PDCLIB_int.h
+++ b/_PDCLIB_int.h
@@ -1,5 +1,7 @@
 /* $Id$ */
 
+/* Release: $Name$ */
+
 /* Internal PDCLib logic <_PDCLIB_internal.h>
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -8,10 +10,13 @@
 
 /* -------------------------------------------------------------------------- */
 /* You should not have to edit anything in this file; if you DO have to, it   */
-/* would be considered a bug / missing feature: notify the author.            */
+/* would be considered a bug / missing feature: notify the author(s).         */
 /* -------------------------------------------------------------------------- */
 
+#ifndef _PDCLIB_CONFIG_H
+#define _PDCLIB_CONFIG_H _PDCLIB_CONFIG_H
 #include <_PDCLIB_config.h>
+#endif
 
 /* null pointer constant */
 #define _PDCLIB_NULL 0
@@ -22,7 +27,7 @@
 /* _PDCLIB_concat( x, y ) concatenates two preprocessor tokens with extending */
 /* -------------------------------------------------------------------------- */
 
-#define _PDCLIB_cc( x, y ) x ## y
+#define _PDCLIB_cc( x, y )     x ## y
 #define _PDCLIB_concat( x, y ) _PDCLIB_cc( x, y )
 
 /* -------------------------------------------------------------------------- */
@@ -84,7 +89,7 @@
 #if   _PDCLIB_LONG_BYTES   == 4
 #define _PDCLIB_LONG_MAX   0x7fffffffL
 #define _PDCLIB_LONG_MIN   (-0x7fffffffL - 1L)
-#define _PDCLIB_LONG_MAX   0xffffffffUL
+#define _PDCLIB_ULONG_MAX   0xffffffffUL
 #elif   _PDCLIB_LONG_BYTES == 8
 #define _PDCLIB_LONG_MAX   0x7fffffffffffffffL
 #define _PDCLIB_LONG_MIN   (-0x7fffffffffffffffL - 1L)
@@ -115,7 +120,7 @@
 /* Setting 'int8_t', its limits, and its literal.                             */
 #if     _PDCLIB_SHRT_BYTES == 1
 typedef signed short       _PDCLIB_int8_t;
-typedef unsigned short     _PDCLIB_int8_t;
+typedef unsigned short     _PDCLIB_uint8_t;
 #define _PDCLIB_INT8_MAX   _PDCLIB_SHRT_MAX
 #define _PDCLIB_INT8_MIN   _PDCLIB_SHRT_MIN
 #define _PDCLIB_UINT8_MAX  _PDCLIB_USHRT_MAX
@@ -136,7 +141,7 @@ typedef unsigned int       _PDCLIB_uint16_t;
 #define _PDCLIB_UINT16_MAX _PDCLIB_UINT_MAX
 #elif   _PDCLIB_SHRT_BYTES == 2
 typedef signed short       _PDCLIB_int16_t;
-typedef unsigned short     _PDCLIB_int16_t;
+typedef unsigned short     _PDCLIB_uint16_t;
 #define _PDCLIB_INT16_MAX  _PDCLIB_SHRT_MAX
 #define _PDCLIB_INT16_MIN  _PDCLIB_SHRT_MIN
 #define _PDCLIB_UINT16_MAX _PDCLIB_USHRT_MAX
@@ -147,13 +152,13 @@ typedef unsigned short     _PDCLIB_int16_t;
 /* Setting 'int32_t', its limits, and its literal                             */
 #if     _PDCLIB_INT_BYTES  == 4
 typedef signed int         _PDCLIB_int32_t;
-typedef unsigned int       _PDCLIB_int32_t;
+typedef unsigned int       _PDCLIB_uint32_t;
 #define _PDCLIB_INT32_MAX  _PDCLIB_INT_MAX
 #define _PDCLIB_INT32_MIN  _PDCLIB_INT_MIN
 #define _PDCLIB_UINT32_MAX _PDCLIB_UINT_MAX
 #elif   _PDCLIB_LONG_BYTES == 4
 typedef signed long        _PDCLIB_int32_t;
-typedef unsigned long      _PDCLIB_int32_t;
+typedef unsigned long      _PDCLIB_uint32_t;
 #define _PDCLIB_INT32_MAX  _PDCLIB_LONG_MAX
 #define _PDCLIB_INT32_MIN  _PDCLIB_LONG_MIN
 #define _PDCLIB_UINT32_MAX _PDCLIB_LONG_MAX
@@ -163,16 +168,16 @@ typedef unsigned long      _PDCLIB_int32_t;
 
 #if     _PDCLIB_LONG_BYTES == 8
 typedef signed long        _PDCLIB_int64_t;
-typedef unsigned long      _PDCLIB_int64_t;
+typedef unsigned long      _PDCLIB_uint64_t;
 #define _PDCLIB_INT64_MAX  _PDCLIB_LONG_MAX
 #define _PDCLIB_INT64_MIN  _PDCLIB_LONG_MIN
-#define _PDCLIB_INT64_MAX  _PDCLIB_ULONG_MAX
+#define _PDCLIB_UINT64_MAX  _PDCLIB_ULONG_MAX
 #elif _PDCLIB_LLONG_BYTES  == 8
 typedef signed long long   _PDCLIB_int64_t;
-typedef unsigned long long _PDCLIB_int64_t;
+typedef unsigned long long _PDCLIB_uint64_t;
 #define _PDCLIB_INT64_MAX  _PDCLIB_LLONG_MAX
 #define _PDCLIB_INT64_MIN  _PDCLIB_LLONG_MIN
-#define _PDCLIB_INT64_MAX  _PDCLIB_ULLONG_MAX
+#define _PDCLIB_UINT64_MAX  _PDCLIB_ULLONG_MAX
 #else
 #error Neither 'long' nor 'long long' are 64-bit.
 #endif
@@ -238,7 +243,7 @@ typedef unsigned _PDCLIB_fast64 _PDCLIB_uint_fast64_t;
 #define _PDCLIB_UINT64_LITERAL ull
 
 /* -------------------------------------------------------------------------- */
-/* <stdint.h> "fast" typedefs                                                 */
+/* <stdint.h> intptr and intmax typedefs and limits                           */
 /* -------------------------------------------------------------------------- */
 
 typedef int                 _PDCLIB_intptr_t;