More elimination of pre-C89-isms.

1 files changed, 35 insertions, 35 deletions

diff --git a/win/tclWinInt.h b/win/tclWinInt.h
index 40aa67c..0843bf1 100644
--- a/win/tclWinInt.h
+++ b/win/tclWinInt.h
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinInt.h,v 1.29 2005/11/03 01:16:07 patthoyts Exp $
+ * RCS: @(#) $Id: tclWinInt.h,v 1.30 2008/05/02 10:27:08 dkf Exp $
  */
 
 #ifndef _TCLWININT
@@ -51,38 +51,38 @@ typedef union {
 typedef struct TclWinProcs {
     int useWide;
 
-    BOOL (WINAPI *buildCommDCBProc)(CONST TCHAR *, LPDCB);
+    BOOL (WINAPI *buildCommDCBProc)(const TCHAR *, LPDCB);
     TCHAR *(WINAPI *charLowerProc)(TCHAR *);
-    BOOL (WINAPI *copyFileProc)(CONST TCHAR *, CONST TCHAR *, BOOL);
-    BOOL (WINAPI *createDirectoryProc)(CONST TCHAR *, LPSECURITY_ATTRIBUTES);
-    HANDLE (WINAPI *createFileProc)(CONST TCHAR *, DWORD, DWORD, 
+    BOOL (WINAPI *copyFileProc)(const TCHAR *, const TCHAR *, BOOL);
+    BOOL (WINAPI *createDirectoryProc)(const TCHAR *, LPSECURITY_ATTRIBUTES);
+    HANDLE (WINAPI *createFileProc)(const TCHAR *, DWORD, DWORD, 
 	    LPSECURITY_ATTRIBUTES, DWORD, DWORD, HANDLE);
-    BOOL (WINAPI *createProcessProc)(CONST TCHAR *, TCHAR *, 
+    BOOL (WINAPI *createProcessProc)(const TCHAR *, TCHAR *, 
 	    LPSECURITY_ATTRIBUTES, LPSECURITY_ATTRIBUTES, BOOL, DWORD, 
-	    LPVOID, CONST TCHAR *, LPSTARTUPINFOA, LPPROCESS_INFORMATION);
-    BOOL (WINAPI *deleteFileProc)(CONST TCHAR *);
-    HANDLE (WINAPI *findFirstFileProc)(CONST TCHAR *, WIN32_FIND_DATAT *);
+	    LPVOID, const TCHAR *, LPSTARTUPINFOA, LPPROCESS_INFORMATION);
+    BOOL (WINAPI *deleteFileProc)(const TCHAR *);
+    HANDLE (WINAPI *findFirstFileProc)(const TCHAR *, WIN32_FIND_DATAT *);
     BOOL (WINAPI *findNextFileProc)(HANDLE, WIN32_FIND_DATAT *);
     BOOL (WINAPI *getComputerNameProc)(WCHAR *, LPDWORD);
     DWORD (WINAPI *getCurrentDirectoryProc)(DWORD, WCHAR *);
-    DWORD (WINAPI *getFileAttributesProc)(CONST TCHAR *);
-    DWORD (WINAPI *getFullPathNameProc)(CONST TCHAR *, DWORD nBufferLength, 
+    DWORD (WINAPI *getFileAttributesProc)(const TCHAR *);
+    DWORD (WINAPI *getFullPathNameProc)(const TCHAR *, DWORD nBufferLength, 
 	    WCHAR *, TCHAR **);
     DWORD (WINAPI *getModuleFileNameProc)(HMODULE, WCHAR *, int);
-    DWORD (WINAPI *getShortPathNameProc)(CONST TCHAR *, WCHAR *, DWORD); 
-    UINT (WINAPI *getTempFileNameProc)(CONST TCHAR *, CONST TCHAR *, UINT, 
+    DWORD (WINAPI *getShortPathNameProc)(const TCHAR *, WCHAR *, DWORD); 
+    UINT (WINAPI *getTempFileNameProc)(const TCHAR *, const TCHAR *, UINT, 
 	    WCHAR *);
     DWORD (WINAPI *getTempPathProc)(DWORD, WCHAR *);
-    BOOL (WINAPI *getVolumeInformationProc)(CONST TCHAR *, WCHAR *, DWORD, 
+    BOOL (WINAPI *getVolumeInformationProc)(const TCHAR *, WCHAR *, DWORD, 
 	    LPDWORD, LPDWORD, LPDWORD, WCHAR *, DWORD);
-    HINSTANCE (WINAPI *loadLibraryProc)(CONST TCHAR *);
-    TCHAR (WINAPI *lstrcpyProc)(WCHAR *, CONST TCHAR *);
-    BOOL (WINAPI *moveFileProc)(CONST TCHAR *, CONST TCHAR *);
-    BOOL (WINAPI *removeDirectoryProc)(CONST TCHAR *);
-    DWORD (WINAPI *searchPathProc)(CONST TCHAR *, CONST TCHAR *, 
-	    CONST TCHAR *, DWORD, WCHAR *, TCHAR **);
-    BOOL (WINAPI *setCurrentDirectoryProc)(CONST TCHAR *);
-    BOOL (WINAPI *setFileAttributesProc)(CONST TCHAR *, DWORD);
+    HINSTANCE (WINAPI *loadLibraryProc)(const TCHAR *);
+    TCHAR (WINAPI *lstrcpyProc)(WCHAR *, const TCHAR *);
+    BOOL (WINAPI *moveFileProc)(const TCHAR *, const TCHAR *);
+    BOOL (WINAPI *removeDirectoryProc)(const TCHAR *);
+    DWORD (WINAPI *searchPathProc)(const TCHAR *, const TCHAR *, 
+	    const TCHAR *, DWORD, WCHAR *, TCHAR **);
+    BOOL (WINAPI *setCurrentDirectoryProc)(const TCHAR *);
+    BOOL (WINAPI *setFileAttributesProc)(const TCHAR *, DWORD);
     /* 
      * These two function pointers will only be set when
      * Tcl_FindExecutable is called.  If you don't ever call that
@@ -90,18 +90,18 @@ typedef struct TclWinProcs {
      * functions through these null pointers.  That is not a bug in Tcl
      * -- Tcl_FindExecutable is obligatory in recent Tcl releases.
      */
-    BOOL (WINAPI *getFileAttributesExProc)(CONST TCHAR *, 
+    BOOL (WINAPI *getFileAttributesExProc)(const TCHAR *, 
 	    GET_FILEEX_INFO_LEVELS, LPVOID);
-    BOOL (WINAPI *createHardLinkProc)(CONST TCHAR*, CONST TCHAR*, 
+    BOOL (WINAPI *createHardLinkProc)(const TCHAR*, const TCHAR*, 
 				      LPSECURITY_ATTRIBUTES);
     
-    /* deleted INT (__cdecl *utimeProc)(CONST TCHAR*, struct _utimbuf *); */
+    /* deleted INT (__cdecl *utimeProc)(const TCHAR*, struct _utimbuf *); */
     /* These two are also NULL at start; see comment above */
-    HANDLE (WINAPI *findFirstFileExProc)(CONST TCHAR*, UINT,
+    HANDLE (WINAPI *findFirstFileExProc)(const TCHAR*, UINT,
 					 LPVOID, UINT,
 					 LPVOID, DWORD);
-    BOOL (WINAPI *getVolumeNameForVMPProc)(CONST TCHAR*, TCHAR*, DWORD);
-    DWORD (WINAPI *getLongPathNameProc)(CONST TCHAR*, TCHAR*, DWORD);
+    BOOL (WINAPI *getVolumeNameForVMPProc)(const TCHAR*, TCHAR*, DWORD);
+    DWORD (WINAPI *getLongPathNameProc)(const TCHAR*, TCHAR*, DWORD);
     /* 
      * These six are for the security sdk to get correct file
      * permissions on NT, 2000, XP, etc.  On 95,98,ME they are
@@ -118,7 +118,7 @@ typedef struct TclWinProcs {
 		      DWORD DesiredAccess, BOOL OpenAsSelf,
 		      PHANDLE TokenHandle);
     BOOL (WINAPI *revertToSelfProc) (void);
-    VOID (WINAPI *mapGenericMaskProc) (PDWORD AccessMask,
+    void (WINAPI *mapGenericMaskProc) (PDWORD AccessMask,
 		      PGENERIC_MAPPING GenericMapping);
     BOOL (WINAPI *accessCheckProc)(PSECURITY_DESCRIPTOR pSecurityDescriptor,
 		    HANDLE ClientToken, DWORD DesiredAccess,
@@ -139,7 +139,7 @@ typedef struct TclWinProcs {
     );
     BOOL (WINAPI *writeConsoleProc)(
       HANDLE hConsoleOutput,
-      const VOID* lpBuffer,
+      const void* lpBuffer,
       DWORD nNumberOfCharsToWrite,
       LPDWORD lpNumberOfCharsWritten,
       LPVOID lpReserved
@@ -154,7 +154,7 @@ MODULE_SCOPE TclWinProcs *tclWinProcs;
  */
 
 MODULE_SCOPE char	TclWinDriveLetterForVolMountPoint(
-			    CONST WCHAR *mountPoint);
+			    const WCHAR *mountPoint);
 MODULE_SCOPE void	TclWinEncodingsCleanup();
 MODULE_SCOPE void	TclWinInit(HINSTANCE hInst);
 MODULE_SCOPE TclFile	TclWinMakeFile(HANDLE handle);
@@ -165,11 +165,11 @@ MODULE_SCOPE Tcl_Channel TclWinOpenFileChannel(HANDLE handle, char *channelName,
 MODULE_SCOPE Tcl_Channel TclWinOpenSerialChannel(HANDLE handle,
 			    char *channelName, int permissions);
 MODULE_SCOPE void	TclWinResetInterfaceEncodings();
-MODULE_SCOPE HANDLE	TclWinSerialReopen(HANDLE handle, CONST TCHAR *name,
+MODULE_SCOPE HANDLE	TclWinSerialReopen(HANDLE handle, const TCHAR *name,
 			    DWORD access);
-MODULE_SCOPE int	TclWinSymLinkCopyDirectory(CONST TCHAR* LinkOriginal,
-			    CONST TCHAR* LinkCopy);
-MODULE_SCOPE int	TclWinSymLinkDelete(CONST TCHAR* LinkOriginal, 
+MODULE_SCOPE int	TclWinSymLinkCopyDirectory(const TCHAR* LinkOriginal,
+			    const TCHAR* LinkCopy);
+MODULE_SCOPE int	TclWinSymLinkDelete(const TCHAR* LinkOriginal, 
 			    int linkOnly);
 #if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
 MODULE_SCOPE void	TclWinFreeAllocCache(void);