From e0f4574cd0b20bacb37ca60ee12d38825fd7dbc8 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 18 Jan 2000 09:12:06 +1100 Subject: [PATCH] - Compile fix for HPUX and Solaris from Andre Lucas --- ChangeLog | 2 ++ configure.in | 1 + defines.h | 13 ++++++++++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b8fec34ca..6b89e130e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 20000118 - Fixed --with-pid-dir option - Makefile fix from Gary E. Miller + - Compile fix for HPUX and Solaris from Andre Lucas + 20000117 - Clean up bsd-bindresvport.c. Use arc4random() for picking initial diff --git a/configure.in b/configure.in index 5fdce1803..a5da0db93 100644 --- a/configure.in +++ b/configure.in @@ -157,6 +157,7 @@ AC_CHECK_FUNC(daemon, ) dnl Checks for data types +AC_CHECK_SIZEOF(char, 1) AC_CHECK_SIZEOF(short int, 2) AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(long int, 4) diff --git a/defines.h b/defines.h index 7cd9b80ee..1a9898b28 100644 --- a/defines.h +++ b/defines.h @@ -53,6 +53,11 @@ enum /* If sys/types.h does not supply intXX_t, supply them ourselves */ /* (or die trying) */ #ifndef HAVE_INTXX_T +# if (SIZEOF_CHAR == 1) +typedef char int8_t; +# else +# error "8 bit int type not found." +# endif # if (SIZEOF_SHORT_INT == 2) typedef short int int16_t; # else @@ -78,11 +83,17 @@ typedef long long int int64_t; /* If sys/types.h does not supply u_intXX_t, supply them ourselves */ #ifndef HAVE_U_INTXX_T # ifdef HAVE_UINTXX_T +typedef uint8_t u_int8_t; typedef uint16_t u_int16_t; typedef uint32_t u_int32_t; typedef uint64_t u_int64_t; # define HAVE_U_INTXX_T 1 # else +# if (SIZEOF_CHAR == 1) +typedef unsigned char u_int8_t; +# else +# error "8 bit int type not found." +# endif # if (SIZEOF_SHORT_INT == 2) typedef unsigned short int u_int16_t; # else @@ -220,7 +231,7 @@ typedef unsigned int size_t; #endif #if !defined(__GNUC__) || (__GNUC__ < 2) -# define __attribute__(x) +# define __attribute__(x) #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */ #if defined(HAVE_SECURITY_PAM_APPL_H) && !defined(DISABLE_PAM)