Minor fixes.

[pdclib] / internals / _PDCLIB_int.h

diff --git a/internals/_PDCLIB_int.h b/internals/_PDCLIB_int.h
index fc2b75bdd00e5a25c7dead5b965cfd6968590536..90276c08dfc5098d14ab67246a7525d169468150 100644 (file)
--- a/internals/_PDCLIB_int.h
+++ b/internals/_PDCLIB_int.h
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* PDCLib internal integer logic <_PDCLIB_int.h>
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -14,8 +12,8 @@
 /* would be considered a bug / missing feature: notify the author(s).         */
 /* -------------------------------------------------------------------------- */
 
-#include <_PDCLIB_config.h>
-#include <_PDCLIB_aux.h>
+#include "_PDCLIB_config.h"
+#include "_PDCLIB_aux.h"
 
 /* null pointer constant */
 #define _PDCLIB_NULL 0
@@ -259,7 +257,7 @@ typedef unsigned _PDCLIB_intmax _PDCLIB_uintmax_t;
 */
 #define _PDCLIB_FREAD     8u
 #define _PDCLIB_FWRITE   16u
-#define _PDCLIB_FAPPEND  32u 
+#define _PDCLIB_FAPPEND  32u
 #define _PDCLIB_FRW      64u
 #define _PDCLIB_FBIN    128u
 
@@ -356,8 +354,8 @@ const char * _PDCLIB_strtox_prelim( const char * p, char * sign, int * base );
 _PDCLIB_uintmax_t _PDCLIB_strtox_main( const char ** p, unsigned int base, _PDCLIB_uintmax_t error, _PDCLIB_uintmax_t limval, int limdigit, char * sign );
 
 /* Digits arrays used by various integer conversion functions */
-extern char _PDCLIB_digits[];
-extern char _PDCLIB_Xdigits[];
+extern const char _PDCLIB_digits[];
+extern const char _PDCLIB_Xdigits[];
 
 /* The worker for all printf() type of functions. The pointer spec should point
    to the introducing '%' of a conversion specifier. The status structure is to
@@ -382,7 +380,7 @@ const char * _PDCLIB_scan( const char * spec, struct _PDCLIB_status_t * status )
 /* Parsing any fopen() style filemode string into a number of flags. */
 unsigned int _PDCLIB_filemode( const char * mode );
 
-/* Sanity checking and preparing of read buffer, should be called first thing 
+/* Sanity checking and preparing of read buffer, should be called first thing
    by any stdio read-data function.
    Returns 0 on success, EOF on error.
    On error, EOF / error flags and errno are set appropriately.
@@ -438,4 +436,24 @@ struct _PDCLIB_ctype_t
     unsigned char collation;
 };
 
+/* -------------------------------------------------------------------------- */
+/* Configuration asserts                                                      */
+/* -------------------------------------------------------------------------- */
+
+_PDCLIB_static_assert( _PDCLIB_CHAR_BIT == 8, "CHAR_BIT != 8 not supported." );
+
+_PDCLIB_static_assert( sizeof( short ) == _PDCLIB_SHRT_BYTES, "Compiler disagrees on _PDCLIB_SHRT_BYTES." );
+_PDCLIB_static_assert( sizeof( int ) == _PDCLIB_INT_BYTES, "Compiler disagrees on _PDCLIB_INT_BYTES." );
+_PDCLIB_static_assert( sizeof( long ) == _PDCLIB_LONG_BYTES, "Compiler disagrees on _PDCLIB_LONG_BYTES." );
+_PDCLIB_static_assert( sizeof( long long ) == _PDCLIB_LLONG_BYTES, "Compiler disagrees on _PDCLIB_LLONG_BYTES." );
+
+_PDCLIB_static_assert( ( (char)-1 < 0 ) == _PDCLIB_CHAR_SIGNED, "Compiler disagrees on _PDCLIB_CHAR_SIGNED." );
+_PDCLIB_static_assert( sizeof( sizeof( int ) ) == sizeof( _PDCLIB_size ), "Compiler disagrees on _PDCLIB_size." );
+
+int _PDCLIB_assert_array[2];
+
+_PDCLIB_static_assert( sizeof( &_PDCLIB_assert_array[1] - &_PDCLIB_assert_array[0] ) == sizeof( _PDCLIB_ptrdiff ), "Compiler disagrees on _PDCLIB_ptrdiff." );
+_PDCLIB_static_assert( sizeof( void * ) == sizeof( _PDCLIB_intmax_t ), "Compiler disagrees on _PDCLIB_intmax_t." );
+_PDCLIB_static_assert( sizeof( void * ) == sizeof( _PDCLIB_uintmax_t ), "Compiler disagrees on _PDCLIB_uintmax_t." );
+
 #endif