This commit was generated by cvs2svn to compensate for changes in r40,

which included commits to RCS files with non-trunk default branches.

diff --git a/src/README b/src/README
index dfe3a0c9efad33aee333e4ec6dec59c5e99ac602..e86306cb662cdff95910d3805fa771c725afda08 100644 (file)
--- a/src/README
+++ b/src/README
@@ -77,7 +77,7 @@ B  Building
 
    2. Begin building
       a. For Linux
-         % make SYS_NAME="i386_linux22" LINUX_VERSION="2.2.14"
+         % make SYS_NAME="i386_linux22" LINUX_VERS="2.2.14"
 
       b. For UNIX versions, specify the system name as given by
          the system type defined in step A1.

diff --git a/src/WINNT/afsadmsvr/ITaAfsAdmSvrTypes.idl b/src/WINNT/afsadmsvr/ITaAfsAdmSvrTypes.idl
index b762e1c3f126284c1904a3cab4e15d25bd8a6611..e73db4a5c0147610f7b7587ad6ea4deee389000d 100644 (file)
--- a/src/WINNT/afsadmsvr/ITaAfsAdmSvrTypes.idl
+++ b/src/WINNT/afsadmsvr/ITaAfsAdmSvrTypes.idl
@@ -209,7 +209,7 @@ typedef enum {
    SERVICETYPE_SIMPLE,
    SERVICETYPE_FS,
    SERVICETYPE_CRON
-} SERVICETYPE;
+} AFSSERVICETYPE;
 cpp_quote ("#endif // AFSCLASS_H")
 
 cpp_quote ("#ifndef AFSCLASS_H")
@@ -222,7 +222,7 @@ typedef enum {
 cpp_quote ("#endif // AFSCLASS_H")
 
 typedef struct {
-   SERVICETYPE ServiceType;
+   AFSSERVICETYPE ServiceType;
    SERVICESTATE ServiceState;
    STRING szAuxStatus;
    STRING szParams;

diff --git a/src/WINNT/afsapplib/fastlist.cpp b/src/WINNT/afsapplib/fastlist.cpp
index db42c44f5c9d1fb7f51b7635f00f8516a1597188..ec0fe7c4ec84a3025e35e922b07495d4ff67e932 100644 (file)
--- a/src/WINNT/afsapplib/fastlist.cpp
+++ b/src/WINNT/afsapplib/fastlist.cpp
@@ -4227,6 +4227,8 @@ LPFASTLIST GetFastList (HWND hList)
 {
    LPFASTLIST pfl;
    try {
+      if (!GetWindowLong (hList, 0))
+         pfl = NULL; else
       if ((pfl = (LPFASTLIST)GetWindowLong (hList, 0))->dwSig != dwSigFASTLIST)
          pfl = NULL;
       else if (pfl->hList != hList)

diff --git a/src/WINNT/afsclass/c_svc.h b/src/WINNT/afsclass/c_svc.h
index 71af06412ca8d7f956183aa4359c08d011c73668..db703e22da8b86514fcb78cfaa493346795ce016 100644 (file)
--- a/src/WINNT/afsclass/c_svc.h
+++ b/src/WINNT/afsclass/c_svc.h
@@ -23,7 +23,7 @@ typedef enum
    SERVICETYPE_SIMPLE,
    SERVICETYPE_FS,
    SERVICETYPE_CRON
-   } SERVICETYPE;
+   } AFSSERVICETYPE;
 
 typedef enum
    {
@@ -44,7 +44,7 @@ typedef struct
    ULONG nStarts;
    ULONG dwErrLast;
    ULONG dwSigLast;
-   SERVICETYPE type;
+   AFSSERVICETYPE type;
    SERVICESTATE state;
    } SERVICESTATUS, *LPSERVICESTATUS;
 

diff --git a/src/WINNT/afsclass/worker.cpp b/src/WINNT/afsclass/worker.cpp
index 69e0d9c612cfe5c8f814d846966013268c6b5312..7ab8a6c07e602c7e4bc1298854575e79926a4eb7 100644 (file)
--- a/src/WINNT/afsclass/worker.cpp
+++ b/src/WINNT/afsclass/worker.cpp
@@ -26,13 +26,21 @@ extern "C" {
  *
  */
 
+#if 0
 static LPCTSTR cszAFSVOSDLL = TCHAR("AfsVosAdmin.dll");
 static LPCTSTR cszAFSBOSDLL = TCHAR("AfsBosAdmin.dll");
 static LPCTSTR cszAFSKASDLL = TCHAR("AfsKasAdmin.dll");
 static LPCTSTR cszAFSPTSDLL = TCHAR("AfsPtsAdmin.dll");
 static LPCTSTR cszAFSUTILDLL = TCHAR("AfsAdminUtil.dll");
 static LPCTSTR cszAFSCLIENTDLL = TCHAR("AfsClientAdmin.dll");
-
+#else
+static LPCTSTR cszAFSVOSDLL = __T("AfsVosAdmin.dll");
+static LPCTSTR cszAFSBOSDLL = __T("AfsBosAdmin.dll");
+static LPCTSTR cszAFSKASDLL = __T("AfsKasAdmin.dll");
+static LPCTSTR cszAFSPTSDLL = __T("AfsPtsAdmin.dll");
+static LPCTSTR cszAFSUTILDLL = __T("AfsAdminUtil.dll");
+static LPCTSTR cszAFSCLIENTDLL = __T("AfsClientAdmin.dll");
+#endif
 
 /*
  * VARIABLES __________________________________________________________________