From: Sam Hartman <hartmans@debian.org>
Date: Tue, 7 Nov 2000 15:57:52 +0000 (+0000)
Subject: This commit was generated by cvs2svn to compensate for changes in r40,
X-Git-Tag: debian/1.0.snap20001106-1~4
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=2e13259ba4ffa14beab678bac56e201b2da32029;p=packages%2Fo%2Fopenafs.git

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 dfe3a0c9e..e86306cb6 100644
--- 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 b762e1c3f..e73db4a5c 100644
--- 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 db42c44f5..ec0fe7c4e 100644
--- 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 71af06412..db703e22d 100644
--- 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 69e0d9c61..7ab8a6c07 100644
--- 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 __________________________________________________________________