From 96c746c75260a3cf6dc58fcf692b44f83ef65a95 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Sun, 26 Jul 2009 11:01:43 -0400
Subject: [PATCH] Permit enhanced audit logs to work on Windows

Gerrit 82 / Git 7b0b6a0ce9b320a3145f9d600596946230d815f0
broke the Windows build.

Add audit-file.obj to file list in NTMakefile.
Remove unnecessary includes from audit.c.
Properly conditionalize includes in audit-file.c.

Reviewed-on: http://gerrit.openafs.org/219
Tested-by: Jeffrey Altman <jaltman@openafs.org>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---
 src/audit/NTMakefile   | 3 ++-
 src/audit/audit-file.c | 9 ++++++---
 src/audit/audit.c      | 4 +---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/audit/NTMakefile b/src/audit/NTMakefile
index 9855cfc2e..68cfa76f9 100644
--- a/src/audit/NTMakefile
+++ b/src/audit/NTMakefile
@@ -20,7 +20,8 @@ INCFILES =\
 LIBFILE = $(DESTDIR)\lib\afs\afsaudit.lib
 
 LIBOBJS =\
-	$(OUT)\audit.obj
+	$(OUT)\audit.obj \
+        $(OUT)\audit-file.obj
 
 $(LIBFILE): $(LIBOBJS) 
 	$(LIBARCH)  
diff --git a/src/audit/audit-file.c b/src/audit/audit-file.c
index c6a715083..b786c8dec 100644
--- a/src/audit/audit-file.c
+++ b/src/audit/audit-file.c
@@ -14,12 +14,15 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdarg.h>
-#include <sys/param.h>
+#include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifndef AFS_NT40_ENV
+#include <sys/param.h>
 #include <unistd.h>
-#include <fcntl.h>
-
+#else
+#include <io.h>
+#endif
 #include "audit-api.h"
 
 static FILE *auditout;
diff --git a/src/audit/audit.c b/src/audit/audit.c
index f4502dc9e..9719b176a 100644
--- a/src/audit/audit.c
+++ b/src/audit/audit.c
@@ -18,8 +18,6 @@
 #include <sys/stat.h>
 #ifndef AFS_NT40_ENV
 #include <unistd.h>
-#else
-#include <io.h>
 #endif
 #ifdef AFS_AIX32_ENV
 #include <sys/audit.h>
@@ -261,7 +259,7 @@ printbuf(int rec, char *audEvent, char *afsName, afs_int32 hostId,
 	    vaFids = va_arg(vaList, struct AFSCBFids *);
 
 	    if (vaFids) {
-                int i;
+                unsigned int i;
                 
                 vaFid = vaFids->AFSCBFids_val;
                 
-- 
2.39.5