From c16ac6ce15cffecbe3ec3d97e384d3e645eb9fc7 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sat, 20 Nov 2010 16:26:22 -0500 Subject: [PATCH] Windows: permit aklog to build with krb4 support and roken aklog.c defined S_ISDIR() which is now defined by roken.h krb4 declared the types uid_t and gid_t which are defined by roken.h. There is no mechanism to disable the declarations within the krb4 header (conf-pc.h) even those the declarations were never required by the Kerberos v4 DLL. The patchset hacks the in tree local copy of the kfw\inc\krb4\conf-pc.h header to avoid the conflict. There is still an annoying warning due to kfw\inc\krb4\krb.h providing a conflicting prototype for gettimeofday() but the function is not used within aklog so there is no harm from it. Change-Id: Icbb326bf8e703957cf4ce9bc991075b90aff6f08 Reviewed-on: http://gerrit.openafs.org/3337 Reviewed-by: Jeffrey Altman Tested-by: Jeffrey Altman --- src/WINNT/aklog/aklog.c | 6 +----- src/WINNT/kfw/inc/krb4/conf-pc.h | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/WINNT/aklog/aklog.c b/src/WINNT/aklog/aklog.c index aaaee4a..1145635 100644 --- a/src/WINNT/aklog/aklog.c +++ b/src/WINNT/aklog/aklog.c @@ -42,7 +42,7 @@ */ #ifndef _WIN64 -#define HAVE_KRB4 +#define HAVE_KRB4 1 #endif #include @@ -82,10 +82,6 @@ #include #include -#define stat _stat -#define __S_ISTYPE(mode, mask) (((mode) & _S_IFMT) == (mask)) -#define S_ISDIR(mode) __S_ISTYPE((mode), _S_IFDIR) - #define DONT_HAVE_GET_AD_TKT #define MAXSYMLINKS 255 diff --git a/src/WINNT/kfw/inc/krb4/conf-pc.h b/src/WINNT/kfw/inc/krb4/conf-pc.h index 043b6f8..aa1d29a 100644 --- a/src/WINNT/kfw/inc/krb4/conf-pc.h +++ b/src/WINNT/kfw/inc/krb4/conf-pc.h @@ -42,7 +42,7 @@ typedef unsigned char u_char; typedef unsigned long u_long; typedef unsigned short u_short; typedef unsigned int u_int; -#define NO_UIDGID_T +/* #define NO_UIDGID_T */ #if !defined(WINDOWS) && !defined(DWORD) typedef long DWORD; -- 1.9.4