diff options
| author | Werner Koch <[email protected]> | 2003-09-23 17:48:33 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2003-09-23 17:48:33 +0000 |
| commit | 4c66e94ff91d680eaf1d9c48a62d66d1951f90ef (patch) | |
| tree | 66ede04edbfe1c45eece46e852093282832f8312 /include/types.h | |
| parent | 2003-09-22 Timo Schulz <[email protected]> (diff) | |
| download | gnupg-4c66e94ff91d680eaf1d9c48a62d66d1951f90ef.tar.gz gnupg-4c66e94ff91d680eaf1d9c48a62d66d1951f90ef.zip | |
Merged most of David Shaw's changes in 1.3 since 2003-06-03.
Diffstat (limited to 'include/types.h')
| -rw-r--r-- | include/types.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/types.h b/include/types.h index 838897aa5..dff512061 100644 --- a/include/types.h +++ b/include/types.h @@ -101,7 +101,11 @@ typedef unsigned long u32; */ #ifndef HAVE_U64_TYPEDEF #undef u64 /* maybe there is a macro with this name */ -#if SIZEOF_UNSIGNED_INT == 8 +#if SIZEOF_UINT64_T == 8 +typedef uint64_t u64; +#define U64_C(c) (UINT64_C(c)) +#define HAVE_U64_TYPEDEF +#elif SIZEOF_UNSIGNED_INT == 8 typedef unsigned int u64; #define U64_C(c) (c ## U) #define HAVE_U64_TYPEDEF @@ -113,10 +117,6 @@ typedef unsigned long u64; typedef unsigned long long u64; #define U64_C(c) (c ## ULL) #define HAVE_U64_TYPEDEF -#elif SIZEOF_UINT64_T == 8 -typedef uint64_t u64; -#define U64_C(c) (UINT64_C(c)) -#define HAVE_U64_TYPEDEF #endif #endif |