From 9eaa20e6bdcfd1be5e94eae9e90c4fe9a1930208 Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Wed, 14 Jul 2010 18:47:20 -0600 Subject: [PATCH] Author: Karl Benoit Bug 2885: AIX support: uchar is already define (more) --- configure.in | 3 +++ helpers/basic_auth/MSNT/smblib.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/configure.in b/configure.in index 35bf19fdf0..e0ed682658 100644 --- a/configure.in +++ b/configure.in @@ -2503,6 +2503,9 @@ AC_CHECK_TYPE(off_t,[ AC_CHECK_SIZEOF(off_t,,SQUID_DEFAULT_SIZEOF_INCLUDES) AC_CHECK_TYPE(mode_t, AC_DEFINE(HAVE_MODE_T,1,[mode_t is defined by the system headers]),,SQUID_DEFAULT_INCLUDES) AC_CHECK_TYPE(fd_mask, AC_DEFINE(HAVE_FD_MASK,1,[fd_mask is defined by the system headers]),,SQUID_DEFAULT_INCLUDES) +dnl On AIX uchar is pre-defined by the headers +AC_CHECK_TYPE(uchar,[AC_DEFINE([HAVE_UCHAR],[1],[uchar is defined in system headers])],,SQUID_DEFAULT_INCLUDES) + dnl Check for special functions AC_FUNC_ALLOCA diff --git a/helpers/basic_auth/MSNT/smblib.c b/helpers/basic_auth/MSNT/smblib.c index b59cc722c3..92aa0a7d7e 100644 --- a/helpers/basic_auth/MSNT/smblib.c +++ b/helpers/basic_auth/MSNT/smblib.c @@ -22,11 +22,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "config.h" int SMBlib_errno; int SMBlib_SMB_Error; #define SMBLIB_ERRNO +#ifndef HAVE_UCHAR #define uchar unsigned char +#endif #include "util.h" #include "smblib-priv.h" #include "smblib.h" -- 2.47.3