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 <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
*/
#ifndef _WIN64
-#define HAVE_KRB4
+#define HAVE_KRB4 1
#endif
#include <afsconfig.h>
#include <afs\pioctl_nt.h>
#include <afs\smb_iocons.h>
-#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
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;