From c351df1dc5294dfd81619fea3c1ff6a7e25ba774 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 23 Dec 1997 17:30:18 +0000 Subject: changed configuration stuff, replaced some Makefile.am by distfiles. --- include/types.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'include/types.h') 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 - #define HAVE_ULONG_TYPEDEF - #define HAVE_USHORT_TYPEDEF -#endif +#include + #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 -- cgit v1.2.3