STABLE12-windows-20041028

update 1.2.x to build on windows, at least

diff --git a/src/WINNT/afsd/cm_conn.c b/src/WINNT/afsd/cm_conn.c
index 6ebdf65221f75f12659b3974745256623985998d..c597c79d2e44ca59d0b871699802c33fec64ae01 100644 (file)
--- a/src/WINNT/afsd/cm_conn.c
+++ b/src/WINNT/afsd/cm_conn.c
@@ -174,8 +174,7 @@ cm_Analyze(cm_conn_t *connp, cm_user_t *userp, cm_req_t *reqp,
                int same;
 
                /* Log server being offline for this volume */
-               osi_Log4(afsd_logp, "cm_Analyze found server %d.%d.%d.%d
-marked offline for a volume",
+               osi_Log4(afsd_logp, "cm_Analyze found server %d.%d.%d.%d marked offline for a volume",
                         ((serverp->addr.sin_addr.s_addr & 0xff)),
                         ((serverp->addr.sin_addr.s_addr & 0xff00)>> 8),
                         ((serverp->addr.sin_addr.s_addr & 0xff0000)>> 16),

diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index 247a00ded5a3d24d2e01e3a514fd6baaed079a79..45f0564effbab1ab6a43edade65072ba5398e8c4 100644 (file)
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -33,12 +33,12 @@
 # Allow them to be overriden in an NTMakefile or via an environment variable.
 
 !IFNDEF APPVER
-APPVER = 4.0
+APPVER = 5.0
 !ENDIF
 
 #define used in WinNT/2000 installation and program version display
-AFSPRODUCT_VERSION=1.2.10
-AFSPRODUCT_FILE_VERSION=1,2,1000,0
+AFSPRODUCT_VERSION=1.2.13
+AFSPRODUCT_FILE_VERSION=1,2,1300,0
 CELLNAME_DEFAULT=openafs.org
 CELLSERVDB_INSTALL=CellServDB.GrandCentral
 CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB
@@ -139,7 +139,8 @@ afscdefs =\
        -I$(DESTDIR)\include\rx \
        -DWIN32_LEAN_AND_MEAN \
        -DSTRICT \
-       -D_WIN32_IE=0x0400 \
+       -D_WIN32_IE=0x0500 \
+        -D_WIN32_WINNT=0x0500 \
      -DAFS_AFSDB_ENV \
      -DAFS_FREELANCE_CLIENT
 
@@ -260,13 +261,13 @@ mfcdlllflags = $(mfcdlllflags) /NODEFAULTLIB:msvcrt.lib
 EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) version.lib $**
 
 # EXE link macro for GUI applications
-EXEGUILINK = $(link) /OUT:$@ $(ldebug) $(guilflags) $(afslflags) $(guilibsdll) $**
+EXEGUILINK = $(link) /OUT:$@ $(ldebug) $(guilflags) $(afslflags) $(guilibsdll) version.lib $**
 
 # EXE link macro for MFC applications
-EXEMFCLINK = $(link) /OUT:$@ $(ldebug) $(mfclflags) $(afslflags) $(mfclibsdll) $**
+EXEMFCLINK = $(link) /OUT:$@ $(ldebug) $(mfclflags) $(afslflags) $(mfclibsdll) version.lib  $**
 
 # DLL link macro for console applications
-DLLCONLINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(conlibsdll) $**
+DLLCONLINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(conlibsdll) version.lib $**
 
 # DLL link macro for GUI applications
 !IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")

diff --git a/src/libafsrpc/afsrpc.def b/src/libafsrpc/afsrpc.def
index 3227b7c2bc562c2b2eca7788be97eee7ea73d0a2..692e9130889381e6b1b85ed5fc3e5a96182c89e4 100644 (file)
--- a/src/libafsrpc/afsrpc.def
+++ b/src/libafsrpc/afsrpc.def
@@ -198,4 +198,5 @@ EXPORTS
        rx_enable_hot_thread                    @203 DATA
        xdr_int64                               @204
        xdr_uint64                              @205
-       osi_AssertFailU                         @206
+               osi_AssertFailU                         @206
+        rx_GetConnection                        @207