STABLE12-winnt-129a-updates-20030515

FIXES 1450

minor updates and bugfixes

diff --git a/src/WINNT/afsd/afsd_service.c b/src/WINNT/afsd/afsd_service.c
index 42979d5c94d221d8adce7b579c7339659e32d40b..65885186152ec8bd3e28bd6d4df14dc41b713d8d 100644 (file)
--- a/src/WINNT/afsd/afsd_service.c
+++ b/src/WINNT/afsd/afsd_service.c
@@ -281,7 +281,12 @@ void main()
        return ;
 }
 #else
+
+#ifdef _CRTAPI1
 void _CRTAPI1 main()
+#else
+void  main()
+#endif
 {
        LONG status = ERROR_SUCCESS;
        SERVICE_TABLE_ENTRY dispatchTable[] = {

diff --git a/src/WINNT/install/InstallShield5/NTMakefile b/src/WINNT/install/InstallShield5/NTMakefile
index 498daa2204a805f16c51a77c6258a8864f08c666..a792608c6293d9ed6c21a254c15484bd2c9daef9 100644 (file)
--- a/src/WINNT/install/InstallShield5/NTMakefile
+++ b/src/WINNT/install/InstallShield5/NTMakefile
@@ -30,6 +30,15 @@ XCOPY= xcopy /s/e
 #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 @@ prep: AFS_component_version_number.txt
     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 --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index 9d390b50d283b85f14d340bf4e5b93827057b821..cb41a97db1ba53d86e1c6a6d9b01b53d561e47c8 100644 (file)
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -37,7 +37,7 @@ APPVER = 4.0
 !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 --git a/src/rx/xdr_mem.c b/src/rx/xdr_mem.c
index a11cfa70e05f605461c9f604e7ef76089ae05e96..3dd8ed16dfdb2e2bdcd82ac4c3c6e600ce68cf13 100644 (file)
--- a/src/rx/xdr_mem.c
+++ b/src/rx/xdr_mem.c
@@ -45,7 +45,9 @@ RCSID("$Header$");
  */
 
 #include "xdr.h"
-#ifndef AFS_NT40_ENV
+#ifdef AFS_NT40_ENV
+#include <limits.h>
+#else
 #include <netinet/in.h>
 #endif
 
@@ -114,7 +116,7 @@ xdrmem_putint32(xdrs, lp)
        afs_int32 *lp;
 {
     if (xdrs->x_handy -= sizeof(afs_int32))
-       eturn (FALSE);
+       return (FALSE);
     else
        xdrs->x_handy -= sizeof(afs_int32);