diff options
| author | Naram Qashat <cyberbotx@cyberbotx.com> | 2011-10-24 16:32:29 -0400 |
|---|---|---|
| committer | Naram Qashat <cyberbotx@cyberbotx.com> | 2011-10-24 16:32:29 -0400 |
| commit | 377a7a968b6a906f262a45abea9a563ffc471938 (patch) | |
| tree | 3743f5d564bd7b40db5659bf6e18dd102b5c5c19 /include/sysconf.h.cmake | |
| parent | d0513d6506ce34b57874ad265daf38ca67878aa0 (diff) | |
Fixed bug #1349 (m_sqlite compiles without error under FreeBSD), as well as use C99's stdint.h (or cstdint if available) to get (u)intX_t types instead of our stupid typedefs. pstdint.h included in case there is no cstdint or stdint.h available.
Diffstat (limited to 'include/sysconf.h.cmake')
| -rw-r--r-- | include/sysconf.h.cmake | 84 |
1 files changed, 8 insertions, 76 deletions
diff --git a/include/sysconf.h.cmake b/include/sysconf.h.cmake index ff391a7b1..8470f81c4 100644 --- a/include/sysconf.h.cmake +++ b/include/sysconf.h.cmake @@ -4,7 +4,7 @@ #cmakedefine DEBUG_BUILD #cmakedefine DEFUMASK @DEFUMASK@ -#cmakedefine HAVE_SYS_TYPES_H 1 +#cmakedefine HAVE_CSTDINT 1 #cmakedefine HAVE_STDINT_H 1 #cmakedefine HAVE_STDDEF_H 1 #cmakedefine HAVE_SETGRENT 1 @@ -18,85 +18,17 @@ #cmakedefine GETTEXT_FOUND 1 #cmakedefine RUNGROUP "@RUNGROUP@" -#cmakedefine HAVE_UINT8_T 1 -#cmakedefine HAVE_U_INT8_T 1 -#cmakedefine HAVE_INT16_T 1 -#cmakedefine HAVE_UINT16_T 1 -#cmakedefine HAVE_U_INT16_T 1 -#cmakedefine HAVE_INT32_T 1 -#cmakedefine HAVE_UINT32_T 1 -#cmakedefine HAVE_U_INT32_T 1 - -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif -#ifdef HAVE_STDINT_H -# include <stdint.h> -#endif -#ifdef HAVE_STDDEF_H -# include <stddef.h> -#endif - -#ifdef HAVE_UINT8_T -typedef uint8_t uint8; -#else -# ifdef HAVE_U_INT8_T -typedef u_int8_t uint8; -# else -# ifdef _WIN32 -typedef unsigned __int8 uint8; -# else -typedef unsigned short uint8; -# endif -# endif -#endif - -#ifdef HAVE_INT16_T -typedef int16_t int16; -#else -# ifdef _WIN32 -typedef signed __int16 int16; -# else -typedef int int16; -# endif -#endif - -#ifdef HAVE_UINT16_T -typedef uint16_t uint16; -#else -# ifdef HAVE_U_INT16_T -typedef u_int16_t uint16; -# else -# ifdef _WIN32 -typedef unsigned __int16 uint16; -# else -typedef unsigned int uint16; -# endif -# endif -#endif - -#ifdef HAVE_INT32_T -typedef int32_t int32; +#ifdef HAVE_CSTDINT +# include <cstdint> #else -# ifdef _WIN32 -typedef signed __int32 int32; +# ifdef HAVE_STDINT_H +# include <stdint.h> # else -typedef long int32; +# include "pstdint.h" # endif #endif - -#ifdef HAVE_UINT32_T -typedef uint32_t uint32; -#else -# ifdef HAVE_U_INT32_T -typedef u_int32_t uint32; -# else -# ifdef _WIN32 -typedef unsigned __int32 uint32; -# else -typedef unsigned long uint32; -# endif -# endif +#ifdef HAVE_STDDEF_H +# include <stddef.h> #endif #ifdef _WIN32 |