kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'update-KWIML' 

984c176 Merge branch 'upstream-kwiml' into update-KWIML
ec1d352 KWIML: Teach INT about broken UINT32_C on old HP
64d0e15 KWIML: Teach INT.h that no HP platform implements SCN*8 formats
6dc0531 KWIML: Teach ABI.h about 'long long' and 'char' on old HP
539064d KWIML: Generalize interface to report broken integer literal macros
This commit is contained in:
David Cole 2012-07-09 14:21:33 -04:00 committed by CMake Topic Stage
parent 8947f11d07 984c1760fb
commit 7d06b4bef7
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Utilities/KWIML/ABI.h.in
View File

@ -156,6 +156,8 @@ suppression macro @KWIML@_ABI_NO_VERIFY was defined.
# define @KWIML@_ABI_CHAR_IS_UNSIGNED 1 # define @KWIML@_ABI_CHAR_IS_UNSIGNED 1
# elif defined(__BORLANDC__) /* Borland default */ # elif defined(__BORLANDC__) /* Borland default */
# define @KWIML@_ABI_CHAR_IS_SIGNED 1 # define @KWIML@_ABI_CHAR_IS_SIGNED 1
# elif defined(__hpux) /* Old HP: no __HP_cc/__HP_aCC/__GNUC__ above */
# define @KWIML@_ABI_CHAR_IS_SIGNED 1 /* (unless +uc) */
# endif # endif
#endif #endif
#if !defined(@KWIML@_ABI_CHAR_IS_UNSIGNED) && !defined(@KWIML@_ABI_CHAR_IS_SIGNED) \ #if !defined(@KWIML@_ABI_CHAR_IS_UNSIGNED) && !defined(@KWIML@_ABI_CHAR_IS_SIGNED) \
@ -251,6 +253,8 @@ suppression macro @KWIML@_ABI_NO_VERIFY was defined.
# else # else
# define @KWIML@_ABI_SIZEOF_LONG_LONG 0 # define @KWIML@_ABI_SIZEOF_LONG_LONG 0
# endif # endif
# elif defined(__hpux) && !defined(__GNUC__) /* Old HP: no __HP_cc/__HP_aCC above */
# define @KWIML@_ABI_SIZEOF_LONG_LONG 8
# endif # endif
#endif #endif
#if !defined(@KWIML@_ABI_SIZEOF_LONG_LONG) && !defined(@KWIML@_ABI_NO_ERROR_LONG_LONG) #if !defined(@KWIML@_ABI_SIZEOF_LONG_LONG) && !defined(@KWIML@_ABI_NO_ERROR_LONG_LONG)

29
Utilities/KWIML/INT.h.in
View File

@ -91,10 +91,11 @@ An includer may test the following macros after inclusion:
Some compilers define integer format macros incorrectly for their Some compilers define integer format macros incorrectly for their
own formatted print/scan implementations. own formatted print/scan implementations.
@KWIML@_INT_BROKEN_INT64_C = macro INT64_C is incorrect if defined @KWIML@_INT_BROKEN_INT#_C = macro INT#_C is incorrect if defined
@KWIML@_INT_BROKEN_UINT64_C = macro UINT64_C is incorrect if defined @KWIML@_INT_BROKEN_UINT#_C = macro UINT#_C is incorrect if defined
Some compilers define integer constant macros incorrectly and Some compilers define integer constant macros incorrectly and
cannot handle literals as large as the integer type. cannot handle literals as large as the integer type or even
produce bad preprocessor syntax.
@KWIML@_INT_BROKEN_INT8_T = type 'int8_t' is available but incorrect @KWIML@_INT_BROKEN_INT8_T = type 'int8_t' is available but incorrect
Some compilers have a flag to make 'char' (un)signed but do not account Some compilers have a flag to make 'char' (un)signed but do not account
@ -259,8 +260,6 @@ An includer may test the following macros after inclusion:
# endif # endif
#elif defined(__SUNPRO_C) || defined(__SUNPRO_CC) #elif defined(__SUNPRO_C) || defined(__SUNPRO_CC)
# define @KWIML@_INT__NO_SCN8 # define @KWIML@_INT__NO_SCN8
#elif defined(__HP_cc) || defined(__HP_aCC)
# define @KWIML@_INT__NO_SCN8
#elif defined(__BORLANDC__) #elif defined(__BORLANDC__)
# define @KWIML@_INT__NO_SCN8 # define @KWIML@_INT__NO_SCN8
# define @KWIML@_INT__NO_SCN64 # define @KWIML@_INT__NO_SCN64
@ -268,6 +267,8 @@ An includer may test the following macros after inclusion:
# define @KWIML@_INT__NO_SCN8 # define @KWIML@_INT__NO_SCN8
#elif defined(__WATCOMC__) #elif defined(__WATCOMC__)
# define @KWIML@_INT__NO_SCN8 # define @KWIML@_INT__NO_SCN8
# elif defined(__hpux) /* HP runtime lacks support (any compiler) */
# define @KWIML@_INT__NO_SCN8
#endif #endif
/* 8-bit d, i */ /* 8-bit d, i */
@ -341,12 +342,12 @@ An includer may test the following macros after inclusion:
#endif #endif
/* 8-bit constants */ /* 8-bit constants */
#if defined(INT8_C) #if defined(INT8_C) && !defined(@KWIML@_INT_BROKEN_INT8_C)
# define @KWIML@_INT_INT8_C(c) INT8_C(c) # define @KWIML@_INT_INT8_C(c) INT8_C(c)
#else #else
# define @KWIML@_INT_INT8_C(c) c # define @KWIML@_INT_INT8_C(c) c
#endif #endif
#if defined(UINT8_C) #if defined(UINT8_C) && !defined(@KWIML@_INT_BROKEN_UINT8_C)
# define @KWIML@_INT_UINT8_C(c) UINT8_C(c) # define @KWIML@_INT_UINT8_C(c) UINT8_C(c)
#else #else
# define @KWIML@_INT_UINT8_C(c) c ## u # define @KWIML@_INT_UINT8_C(c) c ## u
@ -435,12 +436,12 @@ An includer may test the following macros after inclusion:
#endif #endif
/* 16-bit constants */ /* 16-bit constants */
#if defined(INT16_C) #if defined(INT16_C) && !defined(@KWIML@_INT_BROKEN_INT16_C)
# define @KWIML@_INT_INT16_C(c) INT16_C(c) # define @KWIML@_INT_INT16_C(c) INT16_C(c)
#else #else
# define @KWIML@_INT_INT16_C(c) c # define @KWIML@_INT_INT16_C(c) c
#endif #endif
#if defined(UINT16_C) #if defined(UINT16_C) && !defined(@KWIML@_INT_BROKEN_UINT16_C)
# define @KWIML@_INT_UINT16_C(c) UINT16_C(c) # define @KWIML@_INT_UINT16_C(c) UINT16_C(c)
#else #else
# define @KWIML@_INT_UINT16_C(c) c ## u # define @KWIML@_INT_UINT16_C(c) c ## u
@ -528,13 +529,19 @@ An includer may test the following macros after inclusion:
# define @KWIML@_INT_PRIX32 "X" # define @KWIML@_INT_PRIX32 "X"
#endif #endif
#if defined(__hpux) && defined(__GNUC__) && !defined(__LP64__) \
&& defined(__CONCAT__) && defined(__CONCAT_U__)
/* Some HPs define UINT32_C incorrectly and break GNU. */
# define @KWIML@_INT_BROKEN_UINT32_C
#endif
/* 32-bit constants */ /* 32-bit constants */
#if defined(INT32_C) #if defined(INT32_C) && !defined(@KWIML@_INT_BROKEN_INT32_C)
# define @KWIML@_INT_INT32_C(c) INT32_C(c) # define @KWIML@_INT_INT32_C(c) INT32_C(c)
#else #else
# define @KWIML@_INT_INT32_C(c) c # define @KWIML@_INT_INT32_C(c) c
#endif #endif
#if defined(UINT32_C) #if defined(UINT32_C) && !defined(@KWIML@_INT_BROKEN_UINT32_C)
# define @KWIML@_INT_UINT32_C(c) UINT32_C(c) # define @KWIML@_INT_UINT32_C(c) UINT32_C(c)
#else #else
# define @KWIML@_INT_UINT32_C(c) c ## u # define @KWIML@_INT_UINT32_C(c) c ## u