diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 2014-04-18 10:00:42 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 2014-04-18 10:00:42 +0000 |
| commit | dd17af8b4342a8255173ebda7102e50de1bd2ec9 (patch) | |
| tree | 0e7a44b48da0fb67024b3cb8e45caf2d0f98267d /byterun/config.h | |
| parent | 86bd9990f46272873db0d5f897201324279a355c (diff) | |
Simpler variant of commit r14635:
- configure: no change necessary
- byterun/config.h: make sure ARCH_INT64_TYPE and related macros
are always defined, for Coq and others to use.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14636 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'byterun/config.h')
| -rw-r--r-- | byterun/config.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/byterun/config.h b/byterun/config.h index b8d457818..f77598850 100644 --- a/byterun/config.h +++ b/byterun/config.h @@ -44,20 +44,22 @@ typedef unsigned short uint32; #error "No 32-bit integer type available" #endif -#if defined(ARCH_INT64_TYPE) -typedef ARCH_INT64_TYPE int64; -typedef ARCH_UINT64_TYPE uint64; -#elif SIZEOF_LONGLONG == 8 -typedef long long int64; -typedef unsigned long long uint64; +#ifndef ARCH_INT64_TYPE +#if SIZEOF_LONGLONG == 8 +#define ARCH_INT64_TYPE long long +#define ARCH_UINT64_TYPE unsigned long long #define ARCH_INT64_PRINTF_FORMAT "ll" #elif SIZEOF_LONG == 8 -typedef long int64; -typedef unsigned long uint64; +#define ARCH_INT64_TYPE long +#define ARCH_UINT64_TYPE unsigned long #define ARCH_INT64_PRINTF_FORMAT "l" #else #error "No 64-bit integer type available" #endif +#endif + +typedef ARCH_INT64_TYPE int64; +typedef ARCH_UINT64_TYPE uint64; #if SIZEOF_PTR == SIZEOF_LONG /* Standard models: ILP32 or I32LP64 */ |