From 7298b7c6866457dff111638cdce9207feb2580fa Mon Sep 17 00:00:00 2001 From: Fridrich Štrba Date: Thu, 7 Mar 2013 08:05:00 +0100 Subject: make libmariadb/my_config.h much more generic Change-Id: Iea153d6e1b648ac6a7bdf8978cfc1f8016158d6c --- libmariadb/my_config.h | 113 +++++-------------------------------------------- 1 file changed, 11 insertions(+), 102 deletions(-) (limited to 'libmariadb') diff --git a/libmariadb/my_config.h b/libmariadb/my_config.h index bdf86b334ddb..83ff9cff77d0 100644 --- a/libmariadb/my_config.h +++ b/libmariadb/my_config.h @@ -159,111 +159,20 @@ * types and sizes */ /* Types we may use */ -#define SIZEOF_CHAR 1 -#if SIZEOF_CHAR -# define HAVE_CHAR 1 -#endif - -#define SIZEOF_CHARP 8 -#if SIZEOF_CHARP -# define HAVE_CHARP 1 -#endif - -#define SIZEOF_SHORT 2 -#if SIZEOF_SHORT -# define HAVE_SHORT 1 -#endif +#define HAVE_CHAR 1 +#define HAVE_CHARP 1 +#define HAVE_SHORT 1 #define SIZEOF_INT 4 -#if SIZEOF_INT -# define HAVE_INT 1 -#endif - -#define SIZEOF_LONG 8 -#if SIZEOF_LONG -# define HAVE_LONG 1 -#endif - -#define SIZEOF_LONG_LONG 8 -#if SIZEOF_LONG_LONG -# define HAVE_LONG_LONG 1 -#endif - -#define SIZEOF_OFF_T 8 -#if SIZEOF_OFF_T -# define HAVE_OFF_T 1 -#endif - -#define SIZEOF_SIGSET_T 128 -#if SIZEOF_SIGSET_T -# define HAVE_SIGSET_T 1 -#endif - -#define SIZEOF_SIZE_T 8 -#if SIZEOF_SIZE_T -# define HAVE_SIZE_T 1 -#endif - -/* #undef SIZEOF_UCHAR */ -#if SIZEOF_UCHAR -# define HAVE_UCHAR 1 -#endif - -#define SIZEOF_UINT 4 -#if SIZEOF_UINT -# define HAVE_UINT 1 -#endif - -#define SIZEOF_ULONG 8 -#if SIZEOF_ULONG -# define HAVE_ULONG 1 -#endif - -/* #undef SIZEOF_INT8 */ -#if SIZEOF_INT8 -# define HAVE_INT8 1 -#endif -/* #undef SIZEOF_UINT8 */ -#if SIZEOF_UINT8 -# define HAVE_UINT8 1 -#endif - -/* #undef SIZEOF_INT16 */ -#if SIZEOF_INT16 -# define HAVE_INT16 1 -#endif -/* #undef SIZEOF_UINT16 */ -#if SIZEOF_UINT16 -# define HAVE_UINT16 1 -#endif - -/* #undef SIZEOF_INT32 */ -#if SIZEOF_INT32 -# define HAVE_INT32 1 -#endif -/* #undef SIZEOF_UINT32 */ -#if SIZEOF_UINT32 -# define HAVE_UINT32 1 -#endif -/* #undef SIZEOF_U_INT32_T */ -#if SIZEOF_U_INT32_T -# define HAVE_U_INT32_T 1 -#endif - -/* #undef SIZEOF_INT64 */ -#if SIZEOF_INT64 -# define HAVE_INT64 1 -#endif -/* #undef SIZEOF_UINT64 */ -#if SIZEOF_UINT64 -# define HAVE_UINT64 1 -#endif - -/* #undef SIZEOF_SOCKLEN_T */ -#if SIZEOF_SOCKLEN_T -# define HAVE_SOCKLEN_T 1 -#endif +#define HAVE_INT 1 +#define HAVE_LONG 1 +#define HAVE_LONG_LONG 1 +#define HAVE_OFF_T 1 +#define HAVE_SIGSET_T 1 +#define HAVE_SIZE_T 1 +#define HAVE_UINT 1 +#define HAVE_ULONG 1 #define SOCKET_SIZE_TYPE socklen_t #define RETSIGTYPE void -- cgit