diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-02 19:25:17 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-10-02 19:25:17 +0200 |
| commit | c2ca7be5a751879159f3cb591a64bb9568b79762 (patch) | |
| tree | 04e38d4f4a2aad4d789bda0a65b7abb80a3439a2 /yajl/yajl_common.h | |
| parent | 45c152c326d87478fbf41714b4b8e2f7b57a282b (diff) | |
| parent | 3db384424bd7398ffbb7a355cab8f15f3add009f (diff) | |
Updated version 1.9.1+repack from 'upstream/1.9.1+repack'
with Debian dir 98a996367aa69ae41accf9c6d369f600bc94de80
Diffstat (limited to 'yajl/yajl_common.h')
| -rw-r--r-- | yajl/yajl_common.h | 50 |
1 files changed, 34 insertions, 16 deletions
diff --git a/yajl/yajl_common.h b/yajl/yajl_common.h index 95a5ab7..3558c7d 100644 --- a/yajl/yajl_common.h +++ b/yajl/yajl_common.h @@ -53,6 +53,7 @@ extern "C" { #endif // Create a cross platform 64 bit int type "longlong" - GWG +#ifndef NUMLIB_H #if (__STDC_VERSION__ >= 199901L) /* C99 */ @@ -93,27 +94,44 @@ typedef __int64 longlong; /* LLP64 and LP64 models, but won't work with ILP64 which needs int32 */ #ifdef __GNUC__ - -typedef long long longlong; - -# define PF64PREC "ll" /* printf format precision specifier */ -# define CF64PREC "LL" /* Constant precision specifier */ - -# ifndef LLONG_MIN -# define LLONG_MIN (-LLONG_MAX-1) -# endif -# ifndef LLONG_MAX -# define LLONG_MAX __LONG_LONG_MAX__ -# endif -# ifndef ULLONG_MAX -# define ULLONG_MAX (LLONG_MAX * 2ULL + 1) -# endif - +# ifdef __LP64__ /* long long could be 128 bit ? */ + typedef long longlong; +# define PF64PREC "l" /* printf format precision specifier */ +# define CF64PREC "L" /* Constant precision specifier */ +# ifndef LLONG_MAX +# define LLONG_MAX __LONG_MAX__ +# endif +# ifndef LLONG_MIN +# define LLONG_MIN (-LLONG_MAX-1) +# endif +# ifndef ULLONG_MAX +# define ULLONG_MAX (LLONG_MAX * 2UL + 1) +# endif +# else /* long could be 32 bits */ + typedef long long longlong; +# define PF64PREC "ll" /* printf format precision specifier */ +# define CF64PREC "LL" /* Constant precision specifier */ +# ifndef LLONG_MAX +# define LLONG_MAX __LONG_LONG_MAX__ +# endif +# ifndef LLONG_MIN +# define LLONG_MIN (-LLONG_MAX-1) +# endif +# ifndef ULLONG_MAX +# define ULLONG_MAX (LLONG_MAX * 2ULL + 1) +# endif +# endif /* !__LP64__ */ #endif /* __GNUC__ */ #endif /* !_MSC_VER */ #endif /* !__STDC_VERSION__ */ +#else /* !NUMLIB_H */ + +typedef INR64 longlong ; + +#endif /* !NUMLIB_H */ + /** pointer to a malloc function, supporting client overriding memory * allocation routines */ typedef void * (*yajl_malloc_func)(void *ctx, size_t sz); |