diff options
Diffstat (limited to 'include/types.h')
| -rw-r--r-- | include/types.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/types.h b/include/types.h index 575f15224..0a2d8752f 100644 --- a/include/types.h +++ b/include/types.h @@ -21,29 +21,29 @@ #ifndef G10_TYPES_H #define G10_TYPES_H -#ifdef __linux__ - /* FIXME: add stuff to configure to detect for typedefs */ - #include <linux/types.h> - #define HAVE_ULONG_TYPEDEF - #define HAVE_USHORT_TYPEDEF -#endif +#include <sys/types.h> + #ifndef HAVE_BYTE_TYPEDEF + #undef byte /* maybe there is a macro with this name */ typedef unsigned char byte; #define HAVE_BYTE_TYPEDEF #endif #ifndef HAVE_USHORT_TYPEDEF + #undef ushort /* maybe there is a macro with this name */ typedef unsigned short ushort; #define HAVE_USHORT_TYPEDEF #endif #ifndef HAVE_ULONG_TYPEDEF + #undef ulong /* maybe there is a macro with this name */ typedef unsigned long ulong; #define HAVE_ULONG_TYPEDEF #endif #ifndef HAVE_U16_TYPEDEF + #undef u16 /* maybe there is a macro with this name */ #if SIZEOF_UNSIGNED_INT == 2 typedef unsigned int u16; #elif SIZEOF_UNSIGNED_SHORT == 2 @@ -55,6 +55,7 @@ #endif #ifndef HAVE_U32_TYPEDEF + #undef u32 /* maybe there is a macro with this name */ #if SIZEOF_UNSIGNED_INT == 4 typedef unsigned long u32; #elif SIZEOF_UNSIGNED_LONG == 4 |