From: Jeffrey Altman <jaltman@mit.edu>
Date: Mon, 9 Aug 2004 21:57:08 +0000 (+0000)
Subject: STABLE14-msvs8-20040810
X-Git-Tag: openafs-devel-1_3_70~2
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8e2a653337a674cb4e7a9965d5b8d59b0b89f89f;p=packages%2Fo%2Fopenafs.git

STABLE14-msvs8-20040810


changes to support building under msvs8.  this will allow us to produce
64-bit binaries.


(cherry picked from commit 4394e421bb9baadde8a26daaf58f3e15ace30349)
---

diff --git a/src/WINNT/afsd/afsd_init.c b/src/WINNT/afsd/afsd_init.c
index 348c86dcb..db6c3a54c 100644
--- a/src/WINNT/afsd/afsd_init.c
+++ b/src/WINNT/afsd/afsd_init.c
@@ -17,7 +17,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <winsock2.h>
-#include <strsafe.h>
 
 #include <osi.h>
 #include "afsd.h"
@@ -29,6 +28,7 @@
 #include "smb.h"
 #include "cm_rpc.h"
 #include "lanahelper.h"
+#include <strsafe.h>
 #include "afsicf.h"
 
 extern int RXAFSCB_ExecuteRequest(struct rx_call *z_call);
diff --git a/src/WINNT/client_exp/gui2fs.cpp b/src/WINNT/client_exp/gui2fs.cpp
index f0b72680b..6865a63c5 100644
--- a/src/WINNT/client_exp/gui2fs.cpp
+++ b/src/WINNT/client_exp/gui2fs.cpp
@@ -1478,7 +1478,7 @@ BOOL GetTokenInfo(CStringArray& tokenInfo)
 	int cellNum;
 	int rc;
 	int current_time;
-	long tokenExpireTime;
+	time_t tokenExpireTime;
 	char *expireString;
 	char userName[100];
 //	char s[100];
diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi
index f416279ae..b54551b22 100644
--- a/src/WINNT/install/NSIS/OpenAFS.nsi
+++ b/src/WINNT/install/NSIS/OpenAFS.nsi
@@ -1757,10 +1757,12 @@ StartRemove:
   
   Delete /REBOOTOK "$SYSDIR\afsserver.cpl"
   Delete /REBOOTOK "$SYSDIR\afs_cpa.cpl"
+  Delete /REBOOTOK "$SYSDIR\afslogon.dll"
 
   Delete /REBOOTOK "$SYSDIR\afsserver.pdb"
   Delete /REBOOTOK "$SYSDIR\afs_cpa.pdb"
-  
+  Delete /REBOOTOK "$SYSDIR\afslogon.pdb"
+
   RMDir /r "$INSTDIR\Documentation\html\CmdRef"
   RMDir /r "$INSTDIR\Documentation\html\InstallGd"
   RMDir /r "$INSTDIR\Documentation\html\ReleaseNotes"
diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index f0b2dced2..1bb9000a2 100644
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -234,11 +234,19 @@ afscflags =\
 	/GF \
 	/Gd \
 	/Gy \
-	/GX \
 	/Os
 
+!IF ("$(AFSVER_CL)"=="1400")
+afscflags = $(afscflags) /EHsc /wd4996
+!ELSE
+afscflags = $(afscflags) /GX
+!ENDIF
+
 !IF ("$(AFSVER_CL)"!="1200")
-afscdefs = $(afscdefs) /G7 /GT /GS
+afscdefs = $(afscdefs) /GT /GS
+!IF ("$(AFSVER_CL)"!="1400")
+afscdefs = $(afscdefs) /G7
+!ENDIF
 !ENDIF
 
 !IF ("$(AFSDEV_BUILDTYPE)" == "FREE")
diff --git a/src/util/snprintf.c b/src/util/snprintf.c
index 63cc77285..0d804083e 100644
--- a/src/util/snprintf.c
+++ b/src/util/snprintf.c
@@ -508,7 +508,7 @@ afs_snprintf(char *p, size_t avail, const char *fmt, ...)
 
 #if defined(AFS_OSF20_ENV) && !defined(AFS_DUX50_ENV) || defined(AFS_AIX32_ENV) || (defined(AFS_SUN55_ENV) && !defined(AFS_SUN56_ENV)) || !defined(HAVE_VSNPRINTF)
 
-#ifdef AFS_AIX51_ENV
+#if defined(AFS_AIX51_ENV) || defined(AFS_NT40_ENV)
 int
 vsnprintf(char *p, size_t avail, const char *fmt, va_list ap)
 #else