- Compile fix for HPUX and Solaris from Andre Lucas

<andre.lucas@dial.pipex.com>
This commit is contained in:
Damien Miller 2000-01-18 09:12:06 +11:00
parent ca673b3d03
commit e0f4574cd0
3 changed files with 15 additions and 1 deletions

View File

@ -1,6 +1,8 @@
20000118 20000118
- Fixed --with-pid-dir option - Fixed --with-pid-dir option
- Makefile fix from Gary E. Miller <gem@rellim.com> - Makefile fix from Gary E. Miller <gem@rellim.com>
- Compile fix for HPUX and Solaris from Andre Lucas
<andre.lucas@dial.pipex.com>
20000117 20000117
- Clean up bsd-bindresvport.c. Use arc4random() for picking initial - Clean up bsd-bindresvport.c. Use arc4random() for picking initial

View File

@ -157,6 +157,7 @@ AC_CHECK_FUNC(daemon,
) )
dnl Checks for data types dnl Checks for data types
AC_CHECK_SIZEOF(char, 1)
AC_CHECK_SIZEOF(short int, 2) AC_CHECK_SIZEOF(short int, 2)
AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(int, 4)
AC_CHECK_SIZEOF(long int, 4) AC_CHECK_SIZEOF(long int, 4)

View File

@ -53,6 +53,11 @@ enum
/* If sys/types.h does not supply intXX_t, supply them ourselves */ /* If sys/types.h does not supply intXX_t, supply them ourselves */
/* (or die trying) */ /* (or die trying) */
#ifndef HAVE_INTXX_T #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) # if (SIZEOF_SHORT_INT == 2)
typedef short int int16_t; typedef short int int16_t;
# else # else
@ -78,11 +83,17 @@ typedef long long int int64_t;
/* If sys/types.h does not supply u_intXX_t, supply them ourselves */ /* If sys/types.h does not supply u_intXX_t, supply them ourselves */
#ifndef HAVE_U_INTXX_T #ifndef HAVE_U_INTXX_T
# ifdef HAVE_UINTXX_T # ifdef HAVE_UINTXX_T
typedef uint8_t u_int8_t;
typedef uint16_t u_int16_t; typedef uint16_t u_int16_t;
typedef uint32_t u_int32_t; typedef uint32_t u_int32_t;
typedef uint64_t u_int64_t; typedef uint64_t u_int64_t;
# define HAVE_U_INTXX_T 1 # define HAVE_U_INTXX_T 1
# else # 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) # if (SIZEOF_SHORT_INT == 2)
typedef unsigned short int u_int16_t; typedef unsigned short int u_int16_t;
# else # else
@ -220,7 +231,7 @@ typedef unsigned int size_t;
#endif #endif
#if !defined(__GNUC__) || (__GNUC__ < 2) #if !defined(__GNUC__) || (__GNUC__ < 2)
# define __attribute__(x) # define __attribute__(x)
#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */ #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
#if defined(HAVE_SECURITY_PAM_APPL_H) && !defined(DISABLE_PAM) #if defined(HAVE_SECURITY_PAM_APPL_H) && !defined(DISABLE_PAM)