diff options
| author | Petri Lehtinen <petri@digip.org> | 2014-02-11 14:49:15 +0200 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2014-02-11 14:49:15 +0200 |
| commit | 17ec22f514ceb9277bea1e38cc8ea69eec1edd53 (patch) | |
| tree | 55b75defa871dc7178a0f2c6cead32b2bd69b8f5 /cmake/jansson_private_config.h.cmake | |
| parent | a721d36f4143faa94c78e447515994891ce9c30f (diff) | |
| parent | e83ded066a610f8de7caaa3942769321ededa84f (diff) | |
| download | jansson-17ec22f514ceb9277bea1e38cc8ea69eec1edd53.zip jansson-17ec22f514ceb9277bea1e38cc8ea69eec1edd53.tar.gz jansson-17ec22f514ceb9277bea1e38cc8ea69eec1edd53.tar.bz2 | |
Merge branch '2.6'
Diffstat (limited to 'cmake/jansson_private_config.h.cmake')
| -rw-r--r-- | cmake/jansson_private_config.h.cmake | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/cmake/jansson_private_config.h.cmake b/cmake/jansson_private_config.h.cmake index bc81178..b27b9a3 100644 --- a/cmake/jansson_private_config.h.cmake +++ b/cmake/jansson_private_config.h.cmake @@ -1,35 +1,36 @@ -/* Reduced down to the defines that are actually used in the code */ - -/* Define to 1 if you have the <inttypes.h> (and friends) header file. */ -#cmakedefine HAVE_INTTYPES_H 1 -#cmakedefine HAVE_STDINT_H 1 +#cmakedefine HAVE_ENDIAN_H 1 +#cmakedefine HAVE_FCNTL_H 1 +#cmakedefine HAVE_SCHED_H 1 +#cmakedefine HAVE_UNISTD_H 1 +#cmakedefine HAVE_SYS_PARAM_H 1 +#cmakedefine HAVE_SYS_STAT_H 1 +#cmakedefine HAVE_SYS_TIME_H 1 #cmakedefine HAVE_SYS_TYPES_H 1 +#cmakedefine HAVE_STDINT_H 1 -/* We must include this here, as in (eg) utf.h it will want to use - the integer type, which in MSVC2010 will be in stdint.h - (there is no inttypes.h in MSVC2010) */ -#if defined(HAVE_STDINT_H) -# include <stdint.h> -#elif defined(HAVE_INTTYPES_H) -# include <inttypes.h> -#elif defined(HAVE_SYS_TYPES_H) -# include <sys/types.h> -#endif +#cmakedefine HAVE_CLOSE 1 +#cmakedefine HAVE_GETPID 1 +#cmakedefine HAVE_GETTIMEOFDAY 1 +#cmakedefine HAVE_OPEN 1 +#cmakedefine HAVE_READ 1 +#cmakedefine HAVE_SCHED_YIELD 1 -/* Define to 1 if you have the <locale.h> header file. */ -#cmakedefine HAVE_LOCALE_H 1 +#cmakedefine HAVE_SYNC_BUILTINS 1 +#cmakedefine HAVE_ATOMIC_BUILTINS 1 -/* Define to 1 if you have the 'setlocale' function. */ +#cmakedefine HAVE_LOCALE_H 1 #cmakedefine HAVE_SETLOCALE 1 -/* Define to the type of a signed integer type of width exactly 32 bits if - such a type exists and the standard includes do not define it. */ #cmakedefine HAVE_INT32_T 1 - #ifndef HAVE_INT32_T # define int32_t @JSON_INT32@ #endif +#cmakedefine HAVE_UINT32_T 1 +#ifndef HAVE_UINT32_T +# define uint32_t @JSON_UINT32@ +#endif + #cmakedefine HAVE_SSIZE_T 1 #ifndef HAVE_SSIZE_T @@ -43,3 +44,6 @@ #endif #cmakedefine HAVE_VSNPRINTF + +#cmakedefine USE_URANDOM 1 +#cmakedefine USE_WINDOWS_CRYPTOAPI 1 |