[OpenAFS-devel] Windows build 1.2.9a

[James Peterson]

The following changes were based on 1.2.9 source.

These changes were used to build Windows NT 1.2.9a.

diff -NurEB --exclude-from=exclude bas/WINNT/afsd/afsd_service.c
upd/WINNT/afsd/afsd_service.c
--- bas/WINNT/afsd/afsd_service.c	2003-05-13 11:03:40.000000000 -0700
+++ upd/WINNT/afsd/afsd_service.c	2003-05-13 11:04:08.000000000 -0700
@@ -281,7 +281,12 @@
 	return ;
 }
 #else
+
+#ifdef _CRTAPI1
 void _CRTAPI1 main()
+#else
+void  main()
+#endif
 {
 	LONG status = ERROR_SUCCESS;
 	SERVICE_TABLE_ENTRY dispatchTable[] = {
diff -NurEB --exclude-from=exclude
bas/WINNT/install/InstallShield5/NTMakefile
upd/WINNT/install/InstallShield5/NTMakefile
--- bas/WINNT/install/InstallShield5/NTMakefile	2003-05-13
11:03:50.000000000 -0700
+++ upd/WINNT/install/InstallShield5/NTMakefile	2003-05-13
11:04:24.000000000 -0700
@@ -30,6 +30,15 @@
 #check which version of the complier we are using

 prep: AFS_component_version_number.txt
+!	IF (!EXIST($(DESTDIR)\WinInstall\Config\wininet.dll))
+!	ERROR File Not found:$(DESTDIR)\WinInstall\Config\wininet.dll
+!	ENDIF
+!	IF (!EXIST($(DESTDIR)\WinInstall\Config\shlwapi.dll))
+!	ERROR File Not found:$(DESTDIR)\WinInstall\Config\shlwapi.dll
+!	ENDIF
+!	IF (!EXIST($(DESTDIR)\WinInstall\Config\$(CELLSERVDB_INSTALL)))
+!	ERROR File Not found:$(DESTDIR)\WinInstall\Config\$(CELLSERVDB_INSTALL)
+!	ENDIF
 	$(DESTDIR)\bin\util_cr.exe } "$(AFSPRODUCT_VERSION)"
".\lang\en_US\value.txt" ".\lang\en_US\value.shl"
 	$(DESTDIR)\bin\util_cr.exe } "$(AFSPRODUCT_VERSION)" "default.txt"
"default.rge"
 	$(DESTDIR)\bin\util_cr.exe @
"$(AFSROOT)\src\WINNT\install\InstallShield5\lang\en_US\value.shl" "[DATA]
CELLSERVDB_CONFIGNAME=$(CELLSERVDB_CONFIGNAME)"
@@ -50,7 +59,8 @@
     CreateISDirTree.bat
     ScatterFiles.bat
     CreateGeneratedFiles.bat
-    CompileScript.bat
+	pause
+#    CompileScript.bat
 	$(COPY) $(DESTDIR)\WinInstall\Config\wininet.dll ".\Setup Files\Compressed
Files\0009-English\Intel 32\."
 	$(COPY) $(DESTDIR)\WinInstall\Config\shlwapi.dll ".\Setup Files\Compressed
Files\0009-English\Intel 32\."
 	$(COPY) ..\..\afs_setup_utils\_isuser\_isuser.dll ".\Setup
Files\Compressed Files\0009-English\Intel 32\."
diff -NurEB --exclude-from=exclude bas/config/NTMakefile.i386_nt40
upd/config/NTMakefile.i386_nt40
--- bas/config/NTMakefile.i386_nt40	2003-05-13 11:03:33.000000000 -0700
+++ upd/config/NTMakefile.i386_nt40	2003-05-13 11:04:04.000000000 -0700
@@ -37,7 +37,7 @@
 !ENDIF

 #define used in WinNT/2000 installation and program version display
-AFSPRODUCT_VERSION=1.2.8
+AFSPRODUCT_VERSION=1.2.9a
 CELLNAME_DEFAULT=openafs.org
 CELLSERVDB_INSTALL=CellServDB.GrandCentral
 CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB
diff -NurEB --exclude-from=exclude bas/rx/xdr_mem.c upd/rx/xdr_mem.c
--- bas/rx/xdr_mem.c	2003-05-13 11:03:36.000000000 -0700
+++ upd/rx/xdr_mem.c	2003-05-13 11:04:06.000000000 -0700
@@ -45,7 +45,9 @@
  */

 #include "xdr.h"
-#ifndef AFS_NT40_ENV
+#ifdef AFS_NT40_ENV
+#include <limits.h>
+#else
 #include <netinet/in.h>
 #endif

@@ -114,7 +116,7 @@
 	afs_int32 *lp;
 {
     if (xdrs->x_handy -= sizeof(afs_int32))
-	eturn (FALSE);
+	return (FALSE);
     else
 	xdrs->x_handy -= sizeof(afs_int32);