STABLE10-winnt-port-cleanup-20010111

More header cleanup for windows

(cherry picked from commit 4e81c489ee99612fbafa62e8a4a8a07d45fb6ade)

diff --git a/src/WINNT/afsapplib/al_wizard.h b/src/WINNT/afsapplib/al_wizard.h
index 51ef7c5c38cf765e765fd6d46c351aa36362096f..615b027a67a2a42e5528811a073eb5e74c49da9e 100644 (file)
--- a/src/WINNT/afsapplib/al_wizard.h
+++ b/src/WINNT/afsapplib/al_wizard.h
@@ -10,6 +10,8 @@
 #ifndef AL_WIZARD_H
 #define AL_WIZARD_H
 
+#include <windows.h>
+#include <prsht.h>
 #include <WINNT/TaLocale.h>
 #include <WINNT/subclass.h>
 

diff --git a/src/WINNT/afsclass/afsclassfn.cpp b/src/WINNT/afsclass/afsclassfn.cpp
index 6d35691990e35ac27d28c7b86d3ba9b7f3ce97a8..736c922f39795beceaf69210ca1fd2c2c9fb1e4e 100644 (file)
--- a/src/WINNT/afsclass/afsclassfn.cpp
+++ b/src/WINNT/afsclass/afsclassfn.cpp
@@ -1952,7 +1952,7 @@ BOOL AfsClass_RenameFileset (LPIDENT lpiFileset, LPTSTR pszNewName, ULONG *pStat
 
 #define iswhite(_ch) ((_ch)==TEXT(' ') || (_ch)==TEXT('\t'))
 
-LPIDENT AfsClass_CreateService (LPIDENT lpiServer, LPTSTR pszService, LPTSTR pszCommand, LPTSTR pszParams, LPTSTR pszNotifier, SERVICETYPE type, SYSTEMTIME *pstIfCron, ULONG *pStatus)
+LPIDENT AfsClass_CreateService (LPIDENT lpiServer, LPTSTR pszService, LPTSTR pszCommand, LPTSTR pszParams, LPTSTR pszNotifier, AFSSERVICETYPE type, SYSTEMTIME *pstIfCron, ULONG *pStatus)
 {
    BOOL rc = TRUE;
    ULONG status;

diff --git a/src/WINNT/afsclass/afsclassfn.h b/src/WINNT/afsclass/afsclassfn.h
index fc0743d22933a674ed07ce47db6987fec844112a..8cf44ddaf33f2ed0d8f122d61cea506f73d676de 100644 (file)
--- a/src/WINNT/afsclass/afsclassfn.h
+++ b/src/WINNT/afsclass/afsclassfn.h
@@ -137,7 +137,7 @@ BOOL    AfsClass_GetRandomKey         (LPIDENT lpi, LPENCRYPTIONKEY pKey, ULONG
  *
  */
 
-LPIDENT AfsClass_CreateService        (LPIDENT lpiServer, LPTSTR pszService, LPTSTR pszCommand, LPTSTR pszParams, LPTSTR pszNotifier, SERVICETYPE type, SYSTEMTIME *pstIfCron, ULONG *pStatus = NULL);
+LPIDENT AfsClass_CreateService        (LPIDENT lpiServer, LPTSTR pszService, LPTSTR pszCommand, LPTSTR pszParams, LPTSTR pszNotifier, AFSSERVICETYPE type, SYSTEMTIME *pstIfCron, ULONG *pStatus = NULL);
 BOOL    AfsClass_DeleteService        (LPIDENT lpiService, ULONG *pStatus = NULL);
 
 BOOL    AfsClass_StartService         (LPIDENT lpiStart, BOOL fTemporary, ULONG *pStatus = NULL);

diff --git a/src/WINNT/afsclass/worker.h b/src/WINNT/afsclass/worker.h
index 4dab13726e194daa3cfedb8f1746432472292b7e..ac61cc582d69466444aa37caae7abeb34fd1d264 100644 (file)
--- a/src/WINNT/afsclass/worker.h
+++ b/src/WINNT/afsclass/worker.h
@@ -470,7 +470,7 @@ typedef union // WORKERPACKET
       struct {
          PVOID hServer;        // [in] token from BosServerOpen()
          LPTSTR pszService;    // [in] name of new service
-         SERVICETYPE type;     // [in] service type (stCRON, stFS, etc)
+         AFSSERVICETYPE type;  // [in] service type (stCRON, stFS, etc)
          LPTSTR pszCommand;    // [in] full command-line to execute
          LPTSTR pszTimeCron;   // [in] date/time (CRON only)
          LPTSTR pszNotifier;   // [in] command executed on exit

diff --git a/src/WINNT/afssvrmgr/svc_create.h b/src/WINNT/afssvrmgr/svc_create.h
index 2eb27fd4307375ef756244b233e2433ffac0e7cc..0446b4ce8bee1db5f5451c4881253af3531df80b 100644 (file)
--- a/src/WINNT/afssvrmgr/svc_create.h
+++ b/src/WINNT/afssvrmgr/svc_create.h
@@ -24,7 +24,7 @@ typedef struct
    TCHAR szParams[ cchNAME ];
    TCHAR szNotifier[ cchNAME ];
    TCHAR szLogFile[ cchNAME ];
-   SERVICETYPE type;
+   AFSSERVICETYPE type;
    BOOL fRunNow;
    SYSTEMTIME stIfCron;
    } SVC_CREATE_PARAMS, *LPSVC_CREATE_PARAMS;