*** generic/tcl.h 2 Oct 2004 17:00:38 -0000 1.184 --- generic/tcl.h 26 Oct 2004 18:36:54 -0000 *************** *** 67,79 **** * compilers. We use this method because there is no autoconf equivalent. */ ! #ifndef __WIN32__ ! # if defined(_WIN32) || defined(WIN32) || defined(__MINGW32__) || defined(__BORLANDC__) || (defined(__WATCOMC__) && defined(__WINDOWS_386__)) ! # define __WIN32__ ! # ifndef WIN32 ! # define WIN32 # endif # ifndef _WIN32 # define _WIN32 # endif # endif --- 67,81 ---- * compilers. We use this method because there is no autoconf equivalent. */ ! #ifndef WIN32 ! # if defined(_WIN32) || defined(__WIN32__) || defined(__MINGW32__) || defined(__BORLANDC__) || (defined(__WATCOMC__) && defined(__WINDOWS_386__)) ! # define WIN32 ! # ifndef __WIN32__ ! /* old-fashioned Borland intrinsic */ ! # define __WIN32__ # endif # ifndef _WIN32 + /* VC++ intrinsic */ # define _WIN32 # endif # endif *************** *** 82,88 **** /* * STRICT: See MSDN Article Q83456 */ ! #ifdef __WIN32__ # ifndef STRICT # define STRICT # endif --- 84,90 ---- /* * STRICT: See MSDN Article Q83456 */ ! #ifdef WIN32 # ifndef STRICT # define STRICT # endif *************** *** 182,188 **** # define DLLIMPORT # define DLLEXPORT #else ! # if (defined(__WIN32__) && (defined(_MSC_VER) || (__BORLANDC__ >= 0x0550) || defined(__LCC__) || defined(__WATCOMC__) || (defined(__GNUC__) && defined(__declspec)))) # define DLLIMPORT __declspec(dllimport) # define DLLEXPORT __declspec(dllexport) # else --- 184,190 ---- # define DLLIMPORT # define DLLEXPORT #else ! # if (defined(WIN32) && (defined(_MSC_VER) || (__BORLANDC__ >= 0x0550) || defined(__LCC__) || defined(__WATCOMC__) || (defined(__GNUC__) && defined(__declspec)))) # define DLLIMPORT __declspec(dllimport) # define DLLEXPORT __declspec(dllexport) # else *************** *** 279,292 **** * * */ ! #if defined(__WIN32__) && !defined(HAVE_WINNT_IGNORE_VOID) #ifndef VOID #define VOID void typedef char CHAR; typedef short SHORT; typedef long LONG; #endif ! #endif /* __WIN32__ && !HAVE_WINNT_IGNORE_VOID */ /* * Macro to use instead of "void" for arguments that must have --- 281,294 ---- * * */ ! #if defined(WIN32) && !defined(HAVE_WINNT_IGNORE_VOID) #ifndef VOID #define VOID void typedef char CHAR; typedef short SHORT; typedef long LONG; #endif ! #endif /* WIN32 && !HAVE_WINNT_IGNORE_VOID */ /* * Macro to use instead of "void" for arguments that must have *************** *** 343,349 **** #if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG) # if defined(__GNUC__) # define TCL_WIDE_INT_TYPE long long ! # if defined(__WIN32__) && !defined(__CYGWIN__) # define TCL_LL_MODIFIER "I64" # define TCL_LL_MODIFIER_SIZE 3 # else --- 345,351 ---- #if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG) # if defined(__GNUC__) # define TCL_WIDE_INT_TYPE long long ! # if defined(WIN32) && !defined(__CYGWIN__) # define TCL_LL_MODIFIER "I64" # define TCL_LL_MODIFIER_SIZE 3 # else *************** *** 351,357 **** # define TCL_LL_MODIFIER_SIZE 1 # endif typedef struct stat Tcl_StatBuf; ! # elif defined(__WIN32__) # define TCL_WIDE_INT_TYPE __int64 # ifdef __BORLANDC__ typedef struct stati64 Tcl_StatBuf; --- 353,359 ---- # define TCL_LL_MODIFIER_SIZE 1 # endif typedef struct stat Tcl_StatBuf; ! # elif defined(WIN32) # define TCL_WIDE_INT_TYPE __int64 # ifdef __BORLANDC__ typedef struct stati64 Tcl_StatBuf; *************** *** 362,368 **** # define TCL_LL_MODIFIER "I64" # define TCL_LL_MODIFIER_SIZE 3 # endif /* __BORLANDC__ */ ! # else /* __WIN32__ */ /* * Don't know what platform it is and configure hasn't discovered what * is going on for us. Try to guess... --- 364,370 ---- # define TCL_LL_MODIFIER "I64" # define TCL_LL_MODIFIER_SIZE 3 # endif /* __BORLANDC__ */ ! # else /* WIN32 */ /* * Don't know what platform it is and configure hasn't discovered what * is going on for us. Try to guess... *************** *** 377,383 **** # define TCL_WIDE_INT_TYPE long long # endif # endif /* NO_LIMITS_H */ ! # endif /* __WIN32__ */ #endif /* !TCL_WIDE_INT_TYPE & !TCL_WIDE_INT_IS_LONG */ #ifdef TCL_WIDE_INT_IS_LONG # undef TCL_WIDE_INT_TYPE --- 379,385 ---- # define TCL_WIDE_INT_TYPE long long # endif # endif /* NO_LIMITS_H */ ! # endif /* WIN32 */ #endif /* !TCL_WIDE_INT_TYPE & !TCL_WIDE_INT_IS_LONG */ #ifdef TCL_WIDE_INT_IS_LONG # undef TCL_WIDE_INT_TYPE *************** *** 488,494 **** * 'Tcl_CreateThread' and will be called as the main fuction of * the new thread created by that call. */ ! #if defined __WIN32__ typedef unsigned (__stdcall Tcl_ThreadCreateProc) _ANSI_ARGS_((ClientData clientData)); #else typedef void (Tcl_ThreadCreateProc) _ANSI_ARGS_((ClientData clientData)); --- 490,496 ---- * 'Tcl_CreateThread' and will be called as the main fuction of * the new thread created by that call. */ ! #if defined WIN32 typedef unsigned (__stdcall Tcl_ThreadCreateProc) _ANSI_ARGS_((ClientData clientData)); #else typedef void (Tcl_ThreadCreateProc) _ANSI_ARGS_((ClientData clientData)); *************** *** 500,506 **** * differences when writing a Tcl_ThreadCreateProc. See the NewThread * function in generic/tclThreadTest.c for it's usage. */ ! #if defined __WIN32__ # define Tcl_ThreadCreateType unsigned __stdcall # define TCL_THREAD_CREATE_RETURN return 0 #else --- 502,508 ---- * differences when writing a Tcl_ThreadCreateProc. See the NewThread * function in generic/tclThreadTest.c for it's usage. */ ! #if defined WIN32 # define Tcl_ThreadCreateType unsigned __stdcall # define TCL_THREAD_CREATE_RETURN return 0 #else *** generic/tclCmdAH.c 21 Oct 2004 15:19:46 -0000 1.56 --- generic/tclCmdAH.c 26 Oct 2004 18:37:00 -0000 *************** *** 1158,1164 **** * associated with a file, so we always return 1. */ ! #if defined(__WIN32__) value = 1; #else value = (geteuid() == buf.st_uid); --- 1158,1164 ---- * associated with a file, so we always return 1. */ ! #if defined(WIN32) value = 1; #else value = (geteuid() == buf.st_uid); *** generic/tclDecls.h 7 Jun 2004 16:48:44 -0000 1.105 --- generic/tclDecls.h 26 Oct 2004 18:37:10 -0000 *************** *** 81,87 **** unsigned int size, CONST char * file, int line)); #endif ! #if !defined(__WIN32__) /* UNIX */ #ifndef Tcl_CreateFileHandler_TCL_DECLARED #define Tcl_CreateFileHandler_TCL_DECLARED /* 9 */ --- 81,87 ---- unsigned int size, CONST char * file, int line)); #endif ! #if !defined(WIN32) /* UNIX */ #ifndef Tcl_CreateFileHandler_TCL_DECLARED #define Tcl_CreateFileHandler_TCL_DECLARED /* 9 */ *************** *** 89,95 **** Tcl_FileProc * proc, ClientData clientData)); #endif #endif /* UNIX */ ! #if !defined(__WIN32__) /* UNIX */ #ifndef Tcl_DeleteFileHandler_TCL_DECLARED #define Tcl_DeleteFileHandler_TCL_DECLARED /* 10 */ --- 89,95 ---- Tcl_FileProc * proc, ClientData clientData)); #endif #endif /* UNIX */ ! #if !defined(WIN32) /* UNIX */ #ifndef Tcl_DeleteFileHandler_TCL_DECLARED #define Tcl_DeleteFileHandler_TCL_DECLARED /* 10 */ *************** *** 710,716 **** /* 110 */ EXTERN void Tcl_DeleteInterp _ANSI_ARGS_((Tcl_Interp * interp)); #endif ! #if !defined(__WIN32__) /* UNIX */ #ifndef Tcl_DetachPids_TCL_DECLARED #define Tcl_DetachPids_TCL_DECLARED /* 111 */ --- 710,716 ---- /* 110 */ EXTERN void Tcl_DeleteInterp _ANSI_ARGS_((Tcl_Interp * interp)); #endif ! #if !defined(WIN32) /* UNIX */ #ifndef Tcl_DetachPids_TCL_DECLARED #define Tcl_DetachPids_TCL_DECLARED /* 111 */ *************** *** 718,731 **** Tcl_Pid * pidPtr)); #endif #endif /* UNIX */ ! #ifdef __WIN32__ #ifndef Tcl_DetachPids_TCL_DECLARED #define Tcl_DetachPids_TCL_DECLARED /* 111 */ EXTERN void Tcl_DetachPids _ANSI_ARGS_((int numPids, Tcl_Pid * pidPtr)); #endif ! #endif /* __WIN32__ */ #ifndef Tcl_DeleteTimerHandler_TCL_DECLARED #define Tcl_DeleteTimerHandler_TCL_DECLARED /* 112 */ --- 718,731 ---- Tcl_Pid * pidPtr)); #endif #endif /* UNIX */ ! #ifdef WIN32 #ifndef Tcl_DetachPids_TCL_DECLARED #define Tcl_DetachPids_TCL_DECLARED /* 111 */ EXTERN void Tcl_DetachPids _ANSI_ARGS_((int numPids, Tcl_Pid * pidPtr)); #endif ! #endif /* WIN32 */ #ifndef Tcl_DeleteTimerHandler_TCL_DECLARED #define Tcl_DeleteTimerHandler_TCL_DECLARED /* 112 */ *************** *** 1052,1058 **** /* 166 */ EXTERN Tcl_Obj * Tcl_GetObjResult _ANSI_ARGS_((Tcl_Interp * interp)); #endif ! #if !defined(__WIN32__) /* UNIX */ #ifndef Tcl_GetOpenFile_TCL_DECLARED #define Tcl_GetOpenFile_TCL_DECLARED /* 167 */ --- 1052,1058 ---- /* 166 */ EXTERN Tcl_Obj * Tcl_GetObjResult _ANSI_ARGS_((Tcl_Interp * interp)); #endif ! #if !defined(WIN32) /* UNIX */ #ifndef Tcl_GetOpenFile_TCL_DECLARED #define Tcl_GetOpenFile_TCL_DECLARED /* 167 */ *************** *** 1226,1232 **** Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, Tcl_Obj * newValuePtr, int flags)); #endif ! #if !defined(__WIN32__) /* UNIX */ #ifndef Tcl_OpenCommandChannel_TCL_DECLARED #define Tcl_OpenCommandChannel_TCL_DECLARED /* 197 */ --- 1226,1232 ---- Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, Tcl_Obj * newValuePtr, int flags)); #endif ! #if !defined(WIN32) /* UNIX */ #ifndef Tcl_OpenCommandChannel_TCL_DECLARED #define Tcl_OpenCommandChannel_TCL_DECLARED /* 197 */ *************** *** 1235,1241 **** CONST84 char ** argv, int flags)); #endif #endif /* UNIX */ ! #ifdef __WIN32__ #ifndef Tcl_OpenCommandChannel_TCL_DECLARED #define Tcl_OpenCommandChannel_TCL_DECLARED /* 197 */ --- 1235,1241 ---- CONST84 char ** argv, int flags)); #endif #endif /* UNIX */ ! #ifdef WIN32 #ifndef Tcl_OpenCommandChannel_TCL_DECLARED #define Tcl_OpenCommandChannel_TCL_DECLARED /* 197 */ *************** *** 1243,1249 **** Tcl_Interp * interp, int argc, CONST84 char ** argv, int flags)); #endif ! #endif /* __WIN32__ */ #ifndef Tcl_OpenFileChannel_TCL_DECLARED #define Tcl_OpenFileChannel_TCL_DECLARED /* 198 */ --- 1243,1249 ---- Tcl_Interp * interp, int argc, CONST84 char ** argv, int flags)); #endif ! #endif /* WIN32 */ #ifndef Tcl_OpenFileChannel_TCL_DECLARED #define Tcl_OpenFileChannel_TCL_DECLARED /* 198 */ *************** *** 1299,1318 **** EXTERN int Tcl_Read _ANSI_ARGS_((Tcl_Channel chan, char * bufPtr, int toRead)); #endif ! #if !defined(__WIN32__) /* UNIX */ #ifndef Tcl_ReapDetachedProcs_TCL_DECLARED #define Tcl_ReapDetachedProcs_TCL_DECLARED /* 207 */ EXTERN void Tcl_ReapDetachedProcs _ANSI_ARGS_((void)); #endif #endif /* UNIX */ ! #ifdef __WIN32__ #ifndef Tcl_ReapDetachedProcs_TCL_DECLARED #define Tcl_ReapDetachedProcs_TCL_DECLARED /* 207 */ EXTERN void Tcl_ReapDetachedProcs _ANSI_ARGS_((void)); #endif ! #endif /* __WIN32__ */ #ifndef Tcl_RecordAndEval_TCL_DECLARED #define Tcl_RecordAndEval_TCL_DECLARED /* 208 */ --- 1299,1318 ---- EXTERN int Tcl_Read _ANSI_ARGS_((Tcl_Channel chan, char * bufPtr, int toRead)); #endif ! #if !defined(WIN32) /* UNIX */ #ifndef Tcl_ReapDetachedProcs_TCL_DECLARED #define Tcl_ReapDetachedProcs_TCL_DECLARED /* 207 */ EXTERN void Tcl_ReapDetachedProcs _ANSI_ARGS_((void)); #endif #endif /* UNIX */ ! #ifdef WIN32 #ifndef Tcl_ReapDetachedProcs_TCL_DECLARED #define Tcl_ReapDetachedProcs_TCL_DECLARED /* 207 */ EXTERN void Tcl_ReapDetachedProcs _ANSI_ARGS_((void)); #endif ! #endif /* WIN32 */ #ifndef Tcl_RecordAndEval_TCL_DECLARED #define Tcl_RecordAndEval_TCL_DECLARED /* 208 */ *************** *** 3334,3351 **** char * (*tcl_DbCkalloc) _ANSI_ARGS_((unsigned int size, CONST char * file, int line)); /* 6 */ int (*tcl_DbCkfree) _ANSI_ARGS_((char * ptr, CONST char * file, int line)); /* 7 */ char * (*tcl_DbCkrealloc) _ANSI_ARGS_((char * ptr, unsigned int size, CONST char * file, int line)); /* 8 */ ! #if !defined(__WIN32__) /* UNIX */ void (*tcl_CreateFileHandler) _ANSI_ARGS_((int fd, int mask, Tcl_FileProc * proc, ClientData clientData)); /* 9 */ #endif /* UNIX */ ! #ifdef __WIN32__ void *reserved9; ! #endif /* __WIN32__ */ ! #if !defined(__WIN32__) /* UNIX */ void (*tcl_DeleteFileHandler) _ANSI_ARGS_((int fd)); /* 10 */ #endif /* UNIX */ ! #ifdef __WIN32__ void *reserved10; ! #endif /* __WIN32__ */ void (*tcl_SetTimer) _ANSI_ARGS_((Tcl_Time * timePtr)); /* 11 */ void (*tcl_Sleep) _ANSI_ARGS_((int ms)); /* 12 */ int (*tcl_WaitForEvent) _ANSI_ARGS_((Tcl_Time * timePtr)); /* 13 */ --- 3334,3351 ---- char * (*tcl_DbCkalloc) _ANSI_ARGS_((unsigned int size, CONST char * file, int line)); /* 6 */ int (*tcl_DbCkfree) _ANSI_ARGS_((char * ptr, CONST char * file, int line)); /* 7 */ char * (*tcl_DbCkrealloc) _ANSI_ARGS_((char * ptr, unsigned int size, CONST char * file, int line)); /* 8 */ ! #if !defined(WIN32) /* UNIX */ void (*tcl_CreateFileHandler) _ANSI_ARGS_((int fd, int mask, Tcl_FileProc * proc, ClientData clientData)); /* 9 */ #endif /* UNIX */ ! #ifdef WIN32 void *reserved9; ! #endif /* WIN32 */ ! #if !defined(WIN32) /* UNIX */ void (*tcl_DeleteFileHandler) _ANSI_ARGS_((int fd)); /* 10 */ #endif /* UNIX */ ! #ifdef WIN32 void *reserved10; ! #endif /* WIN32 */ void (*tcl_SetTimer) _ANSI_ARGS_((Tcl_Time * timePtr)); /* 11 */ void (*tcl_Sleep) _ANSI_ARGS_((int ms)); /* 12 */ int (*tcl_WaitForEvent) _ANSI_ARGS_((Tcl_Time * timePtr)); /* 13 */ *************** *** 3446,3457 **** void (*tcl_DeleteHashEntry) _ANSI_ARGS_((Tcl_HashEntry * entryPtr)); /* 108 */ void (*tcl_DeleteHashTable) _ANSI_ARGS_((Tcl_HashTable * tablePtr)); /* 109 */ void (*tcl_DeleteInterp) _ANSI_ARGS_((Tcl_Interp * interp)); /* 110 */ ! #if !defined(__WIN32__) /* UNIX */ void (*tcl_DetachPids) _ANSI_ARGS_((int numPids, Tcl_Pid * pidPtr)); /* 111 */ #endif /* UNIX */ ! #ifdef __WIN32__ void (*tcl_DetachPids) _ANSI_ARGS_((int numPids, Tcl_Pid * pidPtr)); /* 111 */ ! #endif /* __WIN32__ */ void (*tcl_DeleteTimerHandler) _ANSI_ARGS_((Tcl_TimerToken token)); /* 112 */ void (*tcl_DeleteTrace) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Trace trace)); /* 113 */ void (*tcl_DontCallWhenDeleted) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_InterpDeleteProc * proc, ClientData clientData)); /* 114 */ --- 3446,3457 ---- void (*tcl_DeleteHashEntry) _ANSI_ARGS_((Tcl_HashEntry * entryPtr)); /* 108 */ void (*tcl_DeleteHashTable) _ANSI_ARGS_((Tcl_HashTable * tablePtr)); /* 109 */ void (*tcl_DeleteInterp) _ANSI_ARGS_((Tcl_Interp * interp)); /* 110 */ ! #if !defined(WIN32) /* UNIX */ void (*tcl_DetachPids) _ANSI_ARGS_((int numPids, Tcl_Pid * pidPtr)); /* 111 */ #endif /* UNIX */ ! #ifdef WIN32 void (*tcl_DetachPids) _ANSI_ARGS_((int numPids, Tcl_Pid * pidPtr)); /* 111 */ ! #endif /* WIN32 */ void (*tcl_DeleteTimerHandler) _ANSI_ARGS_((Tcl_TimerToken token)); /* 112 */ void (*tcl_DeleteTrace) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Trace trace)); /* 113 */ void (*tcl_DontCallWhenDeleted) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_InterpDeleteProc * proc, ClientData clientData)); /* 114 */ *************** *** 3507,3518 **** Tcl_Interp * (*tcl_GetMaster) _ANSI_ARGS_((Tcl_Interp * interp)); /* 164 */ CONST char * (*tcl_GetNameOfExecutable) _ANSI_ARGS_((void)); /* 165 */ Tcl_Obj * (*tcl_GetObjResult) _ANSI_ARGS_((Tcl_Interp * interp)); /* 166 */ ! #if !defined(__WIN32__) /* UNIX */ int (*tcl_GetOpenFile) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * str, int forWriting, int checkUsage, ClientData * filePtr)); /* 167 */ #endif /* UNIX */ ! #ifdef __WIN32__ void *reserved167; ! #endif /* __WIN32__ */ Tcl_PathType (*tcl_GetPathType) _ANSI_ARGS_((CONST char * path)); /* 168 */ int (*tcl_Gets) _ANSI_ARGS_((Tcl_Channel chan, Tcl_DString * dsPtr)); /* 169 */ int (*tcl_GetsObj) _ANSI_ARGS_((Tcl_Channel chan, Tcl_Obj * objPtr)); /* 170 */ --- 3507,3518 ---- Tcl_Interp * (*tcl_GetMaster) _ANSI_ARGS_((Tcl_Interp * interp)); /* 164 */ CONST char * (*tcl_GetNameOfExecutable) _ANSI_ARGS_((void)); /* 165 */ Tcl_Obj * (*tcl_GetObjResult) _ANSI_ARGS_((Tcl_Interp * interp)); /* 166 */ ! #if !defined(WIN32) /* UNIX */ int (*tcl_GetOpenFile) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * str, int forWriting, int checkUsage, ClientData * filePtr)); /* 167 */ #endif /* UNIX */ ! #ifdef WIN32 void *reserved167; ! #endif /* WIN32 */ Tcl_PathType (*tcl_GetPathType) _ANSI_ARGS_((CONST char * path)); /* 168 */ int (*tcl_Gets) _ANSI_ARGS_((Tcl_Channel chan, Tcl_DString * dsPtr)); /* 169 */ int (*tcl_GetsObj) _ANSI_ARGS_((Tcl_Channel chan, Tcl_Obj * objPtr)); /* 170 */ *************** *** 3542,3553 **** void (*tcl_NotifyChannel) _ANSI_ARGS_((Tcl_Channel channel, int mask)); /* 194 */ Tcl_Obj * (*tcl_ObjGetVar2) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, int flags)); /* 195 */ Tcl_Obj * (*tcl_ObjSetVar2) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, Tcl_Obj * newValuePtr, int flags)); /* 196 */ ! #if !defined(__WIN32__) /* UNIX */ Tcl_Channel (*tcl_OpenCommandChannel) _ANSI_ARGS_((Tcl_Interp * interp, int argc, CONST84 char ** argv, int flags)); /* 197 */ #endif /* UNIX */ ! #ifdef __WIN32__ Tcl_Channel (*tcl_OpenCommandChannel) _ANSI_ARGS_((Tcl_Interp * interp, int argc, CONST84 char ** argv, int flags)); /* 197 */ ! #endif /* __WIN32__ */ Tcl_Channel (*tcl_OpenFileChannel) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * fileName, CONST char * modeString, int permissions)); /* 198 */ Tcl_Channel (*tcl_OpenTcpClient) _ANSI_ARGS_((Tcl_Interp * interp, int port, CONST char * address, CONST char * myaddr, int myport, int async)); /* 199 */ Tcl_Channel (*tcl_OpenTcpServer) _ANSI_ARGS_((Tcl_Interp * interp, int port, CONST char * host, Tcl_TcpAcceptProc * acceptProc, ClientData callbackData)); /* 200 */ --- 3542,3553 ---- void (*tcl_NotifyChannel) _ANSI_ARGS_((Tcl_Channel channel, int mask)); /* 194 */ Tcl_Obj * (*tcl_ObjGetVar2) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, int flags)); /* 195 */ Tcl_Obj * (*tcl_ObjSetVar2) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * part1Ptr, Tcl_Obj * part2Ptr, Tcl_Obj * newValuePtr, int flags)); /* 196 */ ! #if !defined(WIN32) /* UNIX */ Tcl_Channel (*tcl_OpenCommandChannel) _ANSI_ARGS_((Tcl_Interp * interp, int argc, CONST84 char ** argv, int flags)); /* 197 */ #endif /* UNIX */ ! #ifdef WIN32 Tcl_Channel (*tcl_OpenCommandChannel) _ANSI_ARGS_((Tcl_Interp * interp, int argc, CONST84 char ** argv, int flags)); /* 197 */ ! #endif /* WIN32 */ Tcl_Channel (*tcl_OpenFileChannel) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * fileName, CONST char * modeString, int permissions)); /* 198 */ Tcl_Channel (*tcl_OpenTcpClient) _ANSI_ARGS_((Tcl_Interp * interp, int port, CONST char * address, CONST char * myaddr, int myport, int async)); /* 199 */ Tcl_Channel (*tcl_OpenTcpServer) _ANSI_ARGS_((Tcl_Interp * interp, int port, CONST char * host, Tcl_TcpAcceptProc * acceptProc, ClientData callbackData)); /* 200 */ *************** *** 3557,3568 **** CONST84_RETURN char * (*tcl_PosixError) _ANSI_ARGS_((Tcl_Interp * interp)); /* 204 */ void (*tcl_QueueEvent) _ANSI_ARGS_((Tcl_Event * evPtr, Tcl_QueuePosition position)); /* 205 */ int (*tcl_Read) _ANSI_ARGS_((Tcl_Channel chan, char * bufPtr, int toRead)); /* 206 */ ! #if !defined(__WIN32__) /* UNIX */ void (*tcl_ReapDetachedProcs) _ANSI_ARGS_((void)); /* 207 */ #endif /* UNIX */ ! #ifdef __WIN32__ void (*tcl_ReapDetachedProcs) _ANSI_ARGS_((void)); /* 207 */ ! #endif /* __WIN32__ */ int (*tcl_RecordAndEval) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * cmd, int flags)); /* 208 */ int (*tcl_RecordAndEvalObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * cmdPtr, int flags)); /* 209 */ void (*tcl_RegisterChannel) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan)); /* 210 */ --- 3557,3568 ---- CONST84_RETURN char * (*tcl_PosixError) _ANSI_ARGS_((Tcl_Interp * interp)); /* 204 */ void (*tcl_QueueEvent) _ANSI_ARGS_((Tcl_Event * evPtr, Tcl_QueuePosition position)); /* 205 */ int (*tcl_Read) _ANSI_ARGS_((Tcl_Channel chan, char * bufPtr, int toRead)); /* 206 */ ! #if !defined(WIN32) /* UNIX */ void (*tcl_ReapDetachedProcs) _ANSI_ARGS_((void)); /* 207 */ #endif /* UNIX */ ! #ifdef WIN32 void (*tcl_ReapDetachedProcs) _ANSI_ARGS_((void)); /* 207 */ ! #endif /* WIN32 */ int (*tcl_RecordAndEval) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * cmd, int flags)); /* 208 */ int (*tcl_RecordAndEvalObj) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * cmdPtr, int flags)); /* 209 */ void (*tcl_RegisterChannel) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan)); /* 210 */ *************** *** 3942,3954 **** #define Tcl_DbCkrealloc \ (tclStubsPtr->tcl_DbCkrealloc) /* 8 */ #endif ! #if !defined(__WIN32__) /* UNIX */ #ifndef Tcl_CreateFileHandler #define Tcl_CreateFileHandler \ (tclStubsPtr->tcl_CreateFileHandler) /* 9 */ #endif #endif /* UNIX */ ! #if !defined(__WIN32__) /* UNIX */ #ifndef Tcl_DeleteFileHandler #define Tcl_DeleteFileHandler \ (tclStubsPtr->tcl_DeleteFileHandler) /* 10 */ --- 3942,3954 ---- #define Tcl_DbCkrealloc \ (tclStubsPtr->tcl_DbCkrealloc) /* 8 */ #endif ! #if !defined(WIN32) /* UNIX */ #ifndef Tcl_CreateFileHandler #define Tcl_CreateFileHandler \ (tclStubsPtr->tcl_CreateFileHandler) /* 9 */ #endif #endif /* UNIX */ ! #if !defined(WIN32) /* UNIX */ #ifndef Tcl_DeleteFileHandler #define Tcl_DeleteFileHandler \ (tclStubsPtr->tcl_DeleteFileHandler) /* 10 */ *************** *** 4354,4371 **** #define Tcl_DeleteInterp \ (tclStubsPtr->tcl_DeleteInterp) /* 110 */ #endif ! #if !defined(__WIN32__) /* UNIX */ #ifndef Tcl_DetachPids #define Tcl_DetachPids \ (tclStubsPtr->tcl_DetachPids) /* 111 */ #endif #endif /* UNIX */ ! #ifdef __WIN32__ #ifndef Tcl_DetachPids #define Tcl_DetachPids \ (tclStubsPtr->tcl_DetachPids) /* 111 */ #endif ! #endif /* __WIN32__ */ #ifndef Tcl_DeleteTimerHandler #define Tcl_DeleteTimerHandler \ (tclStubsPtr->tcl_DeleteTimerHandler) /* 112 */ --- 4354,4371 ---- #define Tcl_DeleteInterp \ (tclStubsPtr->tcl_DeleteInterp) /* 110 */ #endif ! #if !defined(WIN32) /* UNIX */ #ifndef Tcl_DetachPids #define Tcl_DetachPids \ (tclStubsPtr->tcl_DetachPids) /* 111 */ #endif #endif /* UNIX */ ! #ifdef WIN32 #ifndef Tcl_DetachPids #define Tcl_DetachPids \ (tclStubsPtr->tcl_DetachPids) /* 111 */ #endif ! #endif /* WIN32 */ #ifndef Tcl_DeleteTimerHandler #define Tcl_DeleteTimerHandler \ (tclStubsPtr->tcl_DeleteTimerHandler) /* 112 */ *************** *** 4586,4592 **** #define Tcl_GetObjResult \ (tclStubsPtr->tcl_GetObjResult) /* 166 */ #endif ! #if !defined(__WIN32__) /* UNIX */ #ifndef Tcl_GetOpenFile #define Tcl_GetOpenFile \ (tclStubsPtr->tcl_GetOpenFile) /* 167 */ --- 4586,4592 ---- #define Tcl_GetObjResult \ (tclStubsPtr->tcl_GetObjResult) /* 166 */ #endif ! #if !defined(WIN32) /* UNIX */ #ifndef Tcl_GetOpenFile #define Tcl_GetOpenFile \ (tclStubsPtr->tcl_GetOpenFile) /* 167 */ *************** *** 4705,4722 **** #define Tcl_ObjSetVar2 \ (tclStubsPtr->tcl_ObjSetVar2) /* 196 */ #endif ! #if !defined(__WIN32__) /* UNIX */ #ifndef Tcl_OpenCommandChannel #define Tcl_OpenCommandChannel \ (tclStubsPtr->tcl_OpenCommandChannel) /* 197 */ #endif #endif /* UNIX */ ! #ifdef __WIN32__ #ifndef Tcl_OpenCommandChannel #define Tcl_OpenCommandChannel \ (tclStubsPtr->tcl_OpenCommandChannel) /* 197 */ #endif ! #endif /* __WIN32__ */ #ifndef Tcl_OpenFileChannel #define Tcl_OpenFileChannel \ (tclStubsPtr->tcl_OpenFileChannel) /* 198 */ --- 4705,4722 ---- #define Tcl_ObjSetVar2 \ (tclStubsPtr->tcl_ObjSetVar2) /* 196 */ #endif ! #if !defined(WIN32) /* UNIX */ #ifndef Tcl_OpenCommandChannel #define Tcl_OpenCommandChannel \ (tclStubsPtr->tcl_OpenCommandChannel) /* 197 */ #endif #endif /* UNIX */ ! #ifdef WIN32 #ifndef Tcl_OpenCommandChannel #define Tcl_OpenCommandChannel \ (tclStubsPtr->tcl_OpenCommandChannel) /* 197 */ #endif ! #endif /* WIN32 */ #ifndef Tcl_OpenFileChannel #define Tcl_OpenFileChannel \ (tclStubsPtr->tcl_OpenFileChannel) /* 198 */ *************** *** 4753,4770 **** #define Tcl_Read \ (tclStubsPtr->tcl_Read) /* 206 */ #endif ! #if !defined(__WIN32__) /* UNIX */ #ifndef Tcl_ReapDetachedProcs #define Tcl_ReapDetachedProcs \ (tclStubsPtr->tcl_ReapDetachedProcs) /* 207 */ #endif #endif /* UNIX */ ! #ifdef __WIN32__ #ifndef Tcl_ReapDetachedProcs #define Tcl_ReapDetachedProcs \ (tclStubsPtr->tcl_ReapDetachedProcs) /* 207 */ #endif ! #endif /* __WIN32__ */ #ifndef Tcl_RecordAndEval #define Tcl_RecordAndEval \ (tclStubsPtr->tcl_RecordAndEval) /* 208 */ --- 4753,4770 ---- #define Tcl_Read \ (tclStubsPtr->tcl_Read) /* 206 */ #endif ! #if !defined(WIN32) /* UNIX */ #ifndef Tcl_ReapDetachedProcs #define Tcl_ReapDetachedProcs \ (tclStubsPtr->tcl_ReapDetachedProcs) /* 207 */ #endif #endif /* UNIX */ ! #ifdef WIN32 #ifndef Tcl_ReapDetachedProcs #define Tcl_ReapDetachedProcs \ (tclStubsPtr->tcl_ReapDetachedProcs) /* 207 */ #endif ! #endif /* WIN32 */ #ifndef Tcl_RecordAndEval #define Tcl_RecordAndEval \ (tclStubsPtr->tcl_RecordAndEval) /* 208 */ *** generic/tclEnv.c 6 Apr 2004 22:25:50 -0000 1.22 --- generic/tclEnv.c 26 Oct 2004 18:37:16 -0000 *************** *** 53,59 **** CONST char *value)); void TclUnsetEnv _ANSI_ARGS_((CONST char *name)); ! #if defined (__CYGWIN__) && defined(__WIN32__) static void TclCygwinPutenv _ANSI_ARGS_((CONST char *string)); #endif --- 53,59 ---- CONST char *value)); void TclUnsetEnv _ANSI_ARGS_((CONST char *name)); ! #if defined (__CYGWIN__) && defined(WIN32) static void TclCygwinPutenv _ANSI_ARGS_((CONST char *string)); #endif *************** *** 702,708 **** } } ! #if defined(__CYGWIN__) && defined(__WIN32__) #include --- 702,708 ---- } } ! #if defined(__CYGWIN__) && defined(WIN32) #include *************** *** 781,784 **** } } ! #endif /* __CYGWIN__ && __WIN32__ */ --- 781,784 ---- } } ! #endif /* __CYGWIN__ && WIN32 */ *** generic/tclFCmd.c 19 Oct 2004 21:54:07 -0000 1.29 --- generic/tclFCmd.c 26 Oct 2004 18:37:23 -0000 *************** *** 532,538 **** * permissions, we'll let the actual copy/rename return * an error later. */ ! #if !defined(__WIN32__) { Tcl_Obj* perm = Tcl_NewStringObj("u+w",-1); Tcl_IncrRefCount(perm); --- 532,538 ---- * permissions, we'll let the actual copy/rename return * an error later. */ ! #if !defined(WIN32) { Tcl_Obj* perm = Tcl_NewStringObj("u+w",-1); Tcl_IncrRefCount(perm); *** generic/tclFileName.c 7 Oct 2004 14:50:21 -0000 1.60 --- generic/tclFileName.c 26 Oct 2004 18:37:29 -0000 *************** *** 2229,2235 **** Tcl_DStringAppend(&append, ".", 1); } } ! #if defined(__CYGWIN__) && defined(__WIN32__) { extern int cygwin_conv_to_win32_path(CONST char *, char *); char winbuf[MAX_PATH+1]; --- 2229,2235 ---- Tcl_DStringAppend(&append, ".", 1); } } ! #if defined(__CYGWIN__) && defined(WIN32) { extern int cygwin_conv_to_win32_path(CONST char *, char *); char winbuf[MAX_PATH+1]; *************** *** 2238,2244 **** Tcl_DStringFree(&append); Tcl_DStringAppend(&append, winbuf, -1); } ! #endif /* __CYGWIN__ && __WIN32__ */ break; case TCL_PLATFORM_UNIX: if (length == 0 && (Tcl_DStringLength(&append) == 0)) { --- 2238,2244 ---- Tcl_DStringFree(&append); Tcl_DStringAppend(&append, winbuf, -1); } ! #endif /* __CYGWIN__ && WIN32 */ break; case TCL_PLATFORM_UNIX: if (length == 0 && (Tcl_DStringLength(&append) == 0)) { *** generic/tclIntDecls.h 14 Oct 2004 15:06:02 -0000 1.71 --- generic/tclIntDecls.h 26 Oct 2004 18:37:35 -0000 *************** *** 55,61 **** EXTERN void TclAllocateFreeObjects _ANSI_ARGS_((void)); #endif /* Slot 4 is reserved */ ! #if !defined(__WIN32__) /* UNIX */ #ifndef TclCleanupChildren_TCL_DECLARED #define TclCleanupChildren_TCL_DECLARED /* 5 */ --- 55,61 ---- EXTERN void TclAllocateFreeObjects _ANSI_ARGS_((void)); #endif /* Slot 4 is reserved */ ! #if !defined(WIN32) /* UNIX */ #ifndef TclCleanupChildren_TCL_DECLARED #define TclCleanupChildren_TCL_DECLARED /* 5 */ *************** *** 64,70 **** Tcl_Channel errorChan)); #endif #endif /* UNIX */ ! #ifdef __WIN32__ #ifndef TclCleanupChildren_TCL_DECLARED #define TclCleanupChildren_TCL_DECLARED /* 5 */ --- 64,70 ---- Tcl_Channel errorChan)); #endif #endif /* UNIX */ ! #ifdef WIN32 #ifndef TclCleanupChildren_TCL_DECLARED #define TclCleanupChildren_TCL_DECLARED /* 5 */ *************** *** 72,78 **** int numPids, Tcl_Pid * pidPtr, Tcl_Channel errorChan)); #endif ! #endif /* __WIN32__ */ #ifndef TclCleanupCommand_TCL_DECLARED #define TclCleanupCommand_TCL_DECLARED /* 6 */ --- 72,78 ---- int numPids, Tcl_Pid * pidPtr, Tcl_Channel errorChan)); #endif ! #endif /* WIN32 */ #ifndef TclCleanupCommand_TCL_DECLARED #define TclCleanupCommand_TCL_DECLARED /* 6 */ *************** *** 91,97 **** Tcl_Channel inChan, Tcl_Channel outChan, int toRead, Tcl_Obj * cmdPtr)); #endif ! #if !defined(__WIN32__) /* UNIX */ #ifndef TclCreatePipeline_TCL_DECLARED #define TclCreatePipeline_TCL_DECLARED /* 9 */ --- 91,97 ---- Tcl_Channel inChan, Tcl_Channel outChan, int toRead, Tcl_Obj * cmdPtr)); #endif ! #if !defined(WIN32) /* UNIX */ #ifndef TclCreatePipeline_TCL_DECLARED #define TclCreatePipeline_TCL_DECLARED /* 9 */ *************** *** 101,107 **** TclFile * outPipePtr, TclFile * errFilePtr)); #endif #endif /* UNIX */ ! #ifdef __WIN32__ #ifndef TclCreatePipeline_TCL_DECLARED #define TclCreatePipeline_TCL_DECLARED /* 9 */ --- 101,107 ---- TclFile * outPipePtr, TclFile * errFilePtr)); #endif #endif /* UNIX */ ! #ifdef WIN32 #ifndef TclCreatePipeline_TCL_DECLARED #define TclCreatePipeline_TCL_DECLARED /* 9 */ *************** *** 110,116 **** Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, TclFile * outPipePtr, TclFile * errFilePtr)); #endif ! #endif /* __WIN32__ */ #ifndef TclCreateProc_TCL_DECLARED #define TclCreateProc_TCL_DECLARED /* 10 */ --- 110,116 ---- Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, TclFile * outPipePtr, TclFile * errFilePtr)); #endif ! #endif /* WIN32 */ #ifndef TclCreateProc_TCL_DECLARED #define TclCreateProc_TCL_DECLARED /* 10 */ *************** *** 479,485 **** EXTERN int TclSockGetPort _ANSI_ARGS_((Tcl_Interp * interp, char * str, char * proto, int * portPtr)); #endif ! #if !defined(__WIN32__) /* UNIX */ #ifndef TclSockMinimumBuffers_TCL_DECLARED #define TclSockMinimumBuffers_TCL_DECLARED /* 104 */ --- 479,485 ---- EXTERN int TclSockGetPort _ANSI_ARGS_((Tcl_Interp * interp, char * str, char * proto, int * portPtr)); #endif ! #if !defined(WIN32) /* UNIX */ #ifndef TclSockMinimumBuffers_TCL_DECLARED #define TclSockMinimumBuffers_TCL_DECLARED /* 104 */ *************** *** 487,500 **** int size)); #endif #endif /* UNIX */ ! #ifdef __WIN32__ #ifndef TclSockMinimumBuffers_TCL_DECLARED #define TclSockMinimumBuffers_TCL_DECLARED /* 104 */ EXTERN int TclSockMinimumBuffers _ANSI_ARGS_((int sock, int size)); #endif ! #endif /* __WIN32__ */ /* Slot 105 is reserved */ #ifndef TclStatDeleteProc_TCL_DECLARED #define TclStatDeleteProc_TCL_DECLARED --- 487,500 ---- int size)); #endif #endif /* UNIX */ ! #ifdef WIN32 #ifndef TclSockMinimumBuffers_TCL_DECLARED #define TclSockMinimumBuffers_TCL_DECLARED /* 104 */ EXTERN int TclSockMinimumBuffers _ANSI_ARGS_((int sock, int size)); #endif ! #endif /* WIN32 */ /* Slot 105 is reserved */ #ifndef TclStatDeleteProc_TCL_DECLARED #define TclStatDeleteProc_TCL_DECLARED *************** *** 1034,1054 **** int (*tclAccessInsertProc) _ANSI_ARGS_((TclAccessProc_ * proc)); /* 2 */ void (*tclAllocateFreeObjects) _ANSI_ARGS_((void)); /* 3 */ void *reserved4; ! #if !defined(__WIN32__) /* UNIX */ int (*tclCleanupChildren) _ANSI_ARGS_((Tcl_Interp * interp, int numPids, Tcl_Pid * pidPtr, Tcl_Channel errorChan)); /* 5 */ #endif /* UNIX */ ! #ifdef __WIN32__ int (*tclCleanupChildren) _ANSI_ARGS_((Tcl_Interp * interp, int numPids, Tcl_Pid * pidPtr, Tcl_Channel errorChan)); /* 5 */ ! #endif /* __WIN32__ */ void (*tclCleanupCommand) _ANSI_ARGS_((Command * cmdPtr)); /* 6 */ int (*tclCopyAndCollapse) _ANSI_ARGS_((int count, CONST char * src, char * dst)); /* 7 */ int (*tclCopyChannel) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel inChan, Tcl_Channel outChan, int toRead, Tcl_Obj * cmdPtr)); /* 8 */ ! #if !defined(__WIN32__) /* UNIX */ int (*tclCreatePipeline) _ANSI_ARGS_((Tcl_Interp * interp, int argc, CONST char ** argv, Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, TclFile * outPipePtr, TclFile * errFilePtr)); /* 9 */ #endif /* UNIX */ ! #ifdef __WIN32__ int (*tclCreatePipeline) _ANSI_ARGS_((Tcl_Interp * interp, int argc, CONST char ** argv, Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, TclFile * outPipePtr, TclFile * errFilePtr)); /* 9 */ ! #endif /* __WIN32__ */ int (*tclCreateProc) _ANSI_ARGS_((Tcl_Interp * interp, Namespace * nsPtr, CONST char * procName, Tcl_Obj * argsPtr, Tcl_Obj * bodyPtr, Proc ** procPtrPtr)); /* 10 */ void (*tclDeleteCompiledLocalVars) _ANSI_ARGS_((Interp * iPtr, CallFrame * framePtr)); /* 11 */ void (*tclDeleteVars) _ANSI_ARGS_((Interp * iPtr, Tcl_HashTable * tablePtr)); /* 12 */ --- 1034,1054 ---- int (*tclAccessInsertProc) _ANSI_ARGS_((TclAccessProc_ * proc)); /* 2 */ void (*tclAllocateFreeObjects) _ANSI_ARGS_((void)); /* 3 */ void *reserved4; ! #if !defined(WIN32) /* UNIX */ int (*tclCleanupChildren) _ANSI_ARGS_((Tcl_Interp * interp, int numPids, Tcl_Pid * pidPtr, Tcl_Channel errorChan)); /* 5 */ #endif /* UNIX */ ! #ifdef WIN32 int (*tclCleanupChildren) _ANSI_ARGS_((Tcl_Interp * interp, int numPids, Tcl_Pid * pidPtr, Tcl_Channel errorChan)); /* 5 */ ! #endif /* WIN32 */ void (*tclCleanupCommand) _ANSI_ARGS_((Command * cmdPtr)); /* 6 */ int (*tclCopyAndCollapse) _ANSI_ARGS_((int count, CONST char * src, char * dst)); /* 7 */ int (*tclCopyChannel) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel inChan, Tcl_Channel outChan, int toRead, Tcl_Obj * cmdPtr)); /* 8 */ ! #if !defined(WIN32) /* UNIX */ int (*tclCreatePipeline) _ANSI_ARGS_((Tcl_Interp * interp, int argc, CONST char ** argv, Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, TclFile * outPipePtr, TclFile * errFilePtr)); /* 9 */ #endif /* UNIX */ ! #ifdef WIN32 int (*tclCreatePipeline) _ANSI_ARGS_((Tcl_Interp * interp, int argc, CONST char ** argv, Tcl_Pid ** pidArrayPtr, TclFile * inPipePtr, TclFile * outPipePtr, TclFile * errFilePtr)); /* 9 */ ! #endif /* WIN32 */ int (*tclCreateProc) _ANSI_ARGS_((Tcl_Interp * interp, Namespace * nsPtr, CONST char * procName, Tcl_Obj * argsPtr, Tcl_Obj * bodyPtr, Proc ** procPtrPtr)); /* 10 */ void (*tclDeleteCompiledLocalVars) _ANSI_ARGS_((Interp * iPtr, CallFrame * framePtr)); /* 11 */ void (*tclDeleteVars) _ANSI_ARGS_((Interp * iPtr, Tcl_HashTable * tablePtr)); /* 12 */ *************** *** 1143,1154 **** char * (*tclSetPreInitScript) _ANSI_ARGS_((char * string)); /* 101 */ void (*tclSetupEnv) _ANSI_ARGS_((Tcl_Interp * interp)); /* 102 */ int (*tclSockGetPort) _ANSI_ARGS_((Tcl_Interp * interp, char * str, char * proto, int * portPtr)); /* 103 */ ! #if !defined(__WIN32__) /* UNIX */ int (*tclSockMinimumBuffers) _ANSI_ARGS_((int sock, int size)); /* 104 */ #endif /* UNIX */ ! #ifdef __WIN32__ int (*tclSockMinimumBuffers) _ANSI_ARGS_((int sock, int size)); /* 104 */ ! #endif /* __WIN32__ */ void *reserved105; int (*tclStatDeleteProc) _ANSI_ARGS_((TclStatProc_ * proc)); /* 106 */ int (*tclStatInsertProc) _ANSI_ARGS_((TclStatProc_ * proc)); /* 107 */ --- 1143,1154 ---- char * (*tclSetPreInitScript) _ANSI_ARGS_((char * string)); /* 101 */ void (*tclSetupEnv) _ANSI_ARGS_((Tcl_Interp * interp)); /* 102 */ int (*tclSockGetPort) _ANSI_ARGS_((Tcl_Interp * interp, char * str, char * proto, int * portPtr)); /* 103 */ ! #if !defined(WIN32) /* UNIX */ int (*tclSockMinimumBuffers) _ANSI_ARGS_((int sock, int size)); /* 104 */ #endif /* UNIX */ ! #ifdef WIN32 int (*tclSockMinimumBuffers) _ANSI_ARGS_((int sock, int size)); /* 104 */ ! #endif /* WIN32 */ void *reserved105; int (*tclStatDeleteProc) _ANSI_ARGS_((TclStatProc_ * proc)); /* 106 */ int (*tclStatInsertProc) _ANSI_ARGS_((TclStatProc_ * proc)); /* 107 */ *************** *** 1274,1291 **** (tclIntStubsPtr->tclAllocateFreeObjects) /* 3 */ #endif /* Slot 4 is reserved */ ! #if !defined(__WIN32__) /* UNIX */ #ifndef TclCleanupChildren #define TclCleanupChildren \ (tclIntStubsPtr->tclCleanupChildren) /* 5 */ #endif #endif /* UNIX */ ! #ifdef __WIN32__ #ifndef TclCleanupChildren #define TclCleanupChildren \ (tclIntStubsPtr->tclCleanupChildren) /* 5 */ #endif ! #endif /* __WIN32__ */ #ifndef TclCleanupCommand #define TclCleanupCommand \ (tclIntStubsPtr->tclCleanupCommand) /* 6 */ --- 1274,1291 ---- (tclIntStubsPtr->tclAllocateFreeObjects) /* 3 */ #endif /* Slot 4 is reserved */ ! #if !defined(WIN32) /* UNIX */ #ifndef TclCleanupChildren #define TclCleanupChildren \ (tclIntStubsPtr->tclCleanupChildren) /* 5 */ #endif #endif /* UNIX */ ! #ifdef WIN32 #ifndef TclCleanupChildren #define TclCleanupChildren \ (tclIntStubsPtr->tclCleanupChildren) /* 5 */ #endif ! #endif /* WIN32 */ #ifndef TclCleanupCommand #define TclCleanupCommand \ (tclIntStubsPtr->tclCleanupCommand) /* 6 */ *************** *** 1298,1315 **** #define TclCopyChannel \ (tclIntStubsPtr->tclCopyChannel) /* 8 */ #endif ! #if !defined(__WIN32__) /* UNIX */ #ifndef TclCreatePipeline #define TclCreatePipeline \ (tclIntStubsPtr->tclCreatePipeline) /* 9 */ #endif #endif /* UNIX */ ! #ifdef __WIN32__ #ifndef TclCreatePipeline #define TclCreatePipeline \ (tclIntStubsPtr->tclCreatePipeline) /* 9 */ #endif ! #endif /* __WIN32__ */ #ifndef TclCreateProc #define TclCreateProc \ (tclIntStubsPtr->tclCreateProc) /* 10 */ --- 1298,1315 ---- #define TclCopyChannel \ (tclIntStubsPtr->tclCopyChannel) /* 8 */ #endif ! #if !defined(WIN32) /* UNIX */ #ifndef TclCreatePipeline #define TclCreatePipeline \ (tclIntStubsPtr->tclCreatePipeline) /* 9 */ #endif #endif /* UNIX */ ! #ifdef WIN32 #ifndef TclCreatePipeline #define TclCreatePipeline \ (tclIntStubsPtr->tclCreatePipeline) /* 9 */ #endif ! #endif /* WIN32 */ #ifndef TclCreateProc #define TclCreateProc \ (tclIntStubsPtr->tclCreateProc) /* 10 */ *************** *** 1569,1586 **** #define TclSockGetPort \ (tclIntStubsPtr->tclSockGetPort) /* 103 */ #endif ! #if !defined(__WIN32__) /* UNIX */ #ifndef TclSockMinimumBuffers #define TclSockMinimumBuffers \ (tclIntStubsPtr->tclSockMinimumBuffers) /* 104 */ #endif #endif /* UNIX */ ! #ifdef __WIN32__ #ifndef TclSockMinimumBuffers #define TclSockMinimumBuffers \ (tclIntStubsPtr->tclSockMinimumBuffers) /* 104 */ #endif ! #endif /* __WIN32__ */ /* Slot 105 is reserved */ #ifndef TclStatDeleteProc #define TclStatDeleteProc \ --- 1569,1586 ---- #define TclSockGetPort \ (tclIntStubsPtr->tclSockGetPort) /* 103 */ #endif ! #if !defined(WIN32) /* UNIX */ #ifndef TclSockMinimumBuffers #define TclSockMinimumBuffers \ (tclIntStubsPtr->tclSockMinimumBuffers) /* 104 */ #endif #endif /* UNIX */ ! #ifdef WIN32 #ifndef TclSockMinimumBuffers #define TclSockMinimumBuffers \ (tclIntStubsPtr->tclSockMinimumBuffers) /* 104 */ #endif ! #endif /* WIN32 */ /* Slot 105 is reserved */ #ifndef TclStatDeleteProc #define TclStatDeleteProc \ *** generic/tclIntPlatDecls.h 7 Jun 2004 16:48:45 -0000 1.25 --- generic/tclIntPlatDecls.h 26 Oct 2004 18:37:42 -0000 *************** *** 27,33 **** * Exported function declarations: */ ! #if !defined(__WIN32__) /* UNIX */ #ifndef TclGetAndDetachPids_TCL_DECLARED #define TclGetAndDetachPids_TCL_DECLARED /* 0 */ --- 27,33 ---- * Exported function declarations: */ ! #if !defined(WIN32) /* UNIX */ #ifndef TclGetAndDetachPids_TCL_DECLARED #define TclGetAndDetachPids_TCL_DECLARED /* 0 */ *************** *** 115,121 **** int dontCopyAtts)); #endif #endif /* UNIX */ ! #ifdef __WIN32__ #ifndef TclWinConvertError_TCL_DECLARED #define TclWinConvertError_TCL_DECLARED /* 0 */ --- 115,121 ---- int dontCopyAtts)); #endif #endif /* UNIX */ ! #ifdef WIN32 #ifndef TclWinConvertError_TCL_DECLARED #define TclWinConvertError_TCL_DECLARED /* 0 */ *************** *** 264,270 **** EXTERN int TclWinCPUID _ANSI_ARGS_((unsigned int index, unsigned int * regs)); #endif ! #endif /* __WIN32__ */ #ifdef MAC_OSX_TCL #ifndef TclMacOSXGetFileAttribute_TCL_DECLARED #define TclMacOSXGetFileAttribute_TCL_DECLARED --- 264,270 ---- EXTERN int TclWinCPUID _ANSI_ARGS_((unsigned int index, unsigned int * regs)); #endif ! #endif /* WIN32 */ #ifdef MAC_OSX_TCL #ifndef TclMacOSXGetFileAttribute_TCL_DECLARED #define TclMacOSXGetFileAttribute_TCL_DECLARED *************** *** 294,300 **** int magic; struct TclIntPlatStubHooks *hooks; ! #if !defined(__WIN32__) /* UNIX */ void (*tclGetAndDetachPids) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan)); /* 0 */ int (*tclpCloseFile) _ANSI_ARGS_((TclFile file)); /* 1 */ Tcl_Channel (*tclpCreateCommandChannel) _ANSI_ARGS_((TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid * pidPtr)); /* 2 */ --- 294,300 ---- int magic; struct TclIntPlatStubHooks *hooks; ! #if !defined(WIN32) /* UNIX */ void (*tclGetAndDetachPids) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Channel chan)); /* 0 */ int (*tclpCloseFile) _ANSI_ARGS_((TclFile file)); /* 1 */ Tcl_Channel (*tclpCreateCommandChannel) _ANSI_ARGS_((TclFile readFile, TclFile writeFile, TclFile errorFile, int numPids, Tcl_Pid * pidPtr)); /* 2 */ *************** *** 311,317 **** char * (*tclpInetNtoa) _ANSI_ARGS_((struct in_addr addr)); /* 13 */ int (*tclUnixCopyFile) _ANSI_ARGS_((CONST char * src, CONST char * dst, CONST Tcl_StatBuf * statBufPtr, int dontCopyAtts)); /* 14 */ #endif /* UNIX */ ! #ifdef __WIN32__ void (*tclWinConvertError) _ANSI_ARGS_((DWORD errCode)); /* 0 */ void (*tclWinConvertWSAError) _ANSI_ARGS_((DWORD errCode)); /* 1 */ struct servent * (*tclWinGetServByName) _ANSI_ARGS_((CONST char * nm, CONST char * proto)); /* 2 */ --- 311,317 ---- char * (*tclpInetNtoa) _ANSI_ARGS_((struct in_addr addr)); /* 13 */ int (*tclUnixCopyFile) _ANSI_ARGS_((CONST char * src, CONST char * dst, CONST Tcl_StatBuf * statBufPtr, int dontCopyAtts)); /* 14 */ #endif /* UNIX */ ! #ifdef WIN32 void (*tclWinConvertError) _ANSI_ARGS_((DWORD errCode)); /* 0 */ void (*tclWinConvertWSAError) _ANSI_ARGS_((DWORD errCode)); /* 1 */ struct servent * (*tclWinGetServByName) _ANSI_ARGS_((CONST char * nm, CONST char * proto)); /* 2 */ *************** *** 342,348 **** void (*tclWinFlushDirtyChannels) _ANSI_ARGS_((void)); /* 27 */ void (*tclWinResetInterfaces) _ANSI_ARGS_((void)); /* 28 */ int (*tclWinCPUID) _ANSI_ARGS_((unsigned int index, unsigned int * regs)); /* 29 */ ! #endif /* __WIN32__ */ #ifdef MAC_OSX_TCL int (*tclMacOSXGetFileAttribute) _ANSI_ARGS_((Tcl_Interp * interp, int objIndex, Tcl_Obj * fileName, Tcl_Obj ** attributePtrPtr)); /* 15 */ int (*tclMacOSXSetFileAttribute) _ANSI_ARGS_((Tcl_Interp * interp, int objIndex, Tcl_Obj * fileName, Tcl_Obj * attributePtr)); /* 16 */ --- 342,348 ---- void (*tclWinFlushDirtyChannels) _ANSI_ARGS_((void)); /* 27 */ void (*tclWinResetInterfaces) _ANSI_ARGS_((void)); /* 28 */ int (*tclWinCPUID) _ANSI_ARGS_((unsigned int index, unsigned int * regs)); /* 29 */ ! #endif /* WIN32 */ #ifdef MAC_OSX_TCL int (*tclMacOSXGetFileAttribute) _ANSI_ARGS_((Tcl_Interp * interp, int objIndex, Tcl_Obj * fileName, Tcl_Obj ** attributePtrPtr)); /* 15 */ int (*tclMacOSXSetFileAttribute) _ANSI_ARGS_((Tcl_Interp * interp, int objIndex, Tcl_Obj * fileName, Tcl_Obj * attributePtr)); /* 16 */ *************** *** 364,370 **** * Inline function declarations: */ ! #if !defined(__WIN32__) /* UNIX */ #ifndef TclGetAndDetachPids #define TclGetAndDetachPids \ (tclIntPlatStubsPtr->tclGetAndDetachPids) /* 0 */ --- 364,370 ---- * Inline function declarations: */ ! #if !defined(WIN32) /* UNIX */ #ifndef TclGetAndDetachPids #define TclGetAndDetachPids \ (tclIntPlatStubsPtr->tclGetAndDetachPids) /* 0 */ *************** *** 423,429 **** (tclIntPlatStubsPtr->tclUnixCopyFile) /* 14 */ #endif #endif /* UNIX */ ! #ifdef __WIN32__ #ifndef TclWinConvertError #define TclWinConvertError \ (tclIntPlatStubsPtr->tclWinConvertError) /* 0 */ --- 423,429 ---- (tclIntPlatStubsPtr->tclUnixCopyFile) /* 14 */ #endif #endif /* UNIX */ ! #ifdef WIN32 #ifndef TclWinConvertError #define TclWinConvertError \ (tclIntPlatStubsPtr->tclWinConvertError) /* 0 */ *************** *** 529,535 **** #define TclWinCPUID \ (tclIntPlatStubsPtr->tclWinCPUID) /* 29 */ #endif ! #endif /* __WIN32__ */ #ifdef MAC_OSX_TCL #ifndef TclMacOSXGetFileAttribute #define TclMacOSXGetFileAttribute \ --- 529,535 ---- #define TclWinCPUID \ (tclIntPlatStubsPtr->tclWinCPUID) /* 29 */ #endif ! #endif /* WIN32 */ #ifdef MAC_OSX_TCL #ifndef TclMacOSXGetFileAttribute #define TclMacOSXGetFileAttribute \ *** generic/tclIOUtil.c 15 Oct 2004 04:01:31 -0000 1.112 --- generic/tclIOUtil.c 26 Oct 2004 18:37:52 -0000 *************** *** 21,27 **** */ #include "tclInt.h" ! #ifdef __WIN32__ #include "tclWinInt.h" #endif #include "tclFileSystem.h" --- 21,27 ---- */ #include "tclInt.h" ! #ifdef WIN32 #include "tclWinInt.h" #endif #include "tclFileSystem.h" *************** *** 770,776 **** statProcList = NULL; accessProcList = NULL; openFileChannelProcList = NULL; ! #ifdef __WIN32__ TclWinEncodingsCleanup(); #endif } --- 770,776 ---- statProcList = NULL; accessProcList = NULL; openFileChannelProcList = NULL; ! #ifdef WIN32 TclWinEncodingsCleanup(); #endif } *************** *** 801,807 **** * down the cause. */ ! #ifdef __WIN32__ /* * Cleans up the win32 API filesystem proc lookup table. This must * happen very late in finalization so that deleting of copied --- 801,807 ---- * down the cause. */ ! #ifdef WIN32 /* * Cleans up the win32 API filesystem proc lookup table. This must * happen very late in finalization so that deleting of copied *************** *** 2965,2971 **** FsDivertLoad *tvdlPtr; int retVal; ! #if !defined(__WIN32__) /* * Do we need to set appropriate permissions * on the file? This may be required on some --- 2965,2971 ---- FsDivertLoad *tvdlPtr; int retVal; ! #if !defined(WIN32) /* * Do we need to set appropriate permissions * on the file? This may be required on some *** generic/tclLoad.c 9 Mar 2004 12:59:05 -0000 1.13 --- generic/tclLoad.c 26 Oct 2004 18:37:59 -0000 *************** *** 789,795 **** * Unload the shared library from the application memory... */ ! #if defined(TCL_UNLOAD_DLLS) || defined(__WIN32__) /* * Some Unix dlls are poorly behaved - registering things like * atexit calls that can't be unregistered. If you unload --- 789,795 ---- * Unload the shared library from the application memory... */ ! #if defined(TCL_UNLOAD_DLLS) || defined(WIN32) /* * Some Unix dlls are poorly behaved - registering things like * atexit calls that can't be unregistered. If you unload *************** *** 1155,1161 **** while (firstPackagePtr != NULL) { pkgPtr = firstPackagePtr; firstPackagePtr = pkgPtr->nextPtr; ! #if defined(TCL_UNLOAD_DLLS) || defined(__WIN32__) /* * Some Unix dlls are poorly behaved - registering things like * atexit calls that can't be unregistered. If you unload --- 1155,1161 ---- while (firstPackagePtr != NULL) { pkgPtr = firstPackagePtr; firstPackagePtr = pkgPtr->nextPtr; ! #if defined(TCL_UNLOAD_DLLS) || defined(WIN32) /* * Some Unix dlls are poorly behaved - registering things like * atexit calls that can't be unregistered. If you unload *** generic/tclNotify.c 15 Jul 2004 21:17:03 -0000 1.15 --- generic/tclNotify.c 26 Oct 2004 18:38:03 -0000 *************** *** 211,217 **** Tcl_SetNotifier(notifierProcPtr) Tcl_NotifierProcs *notifierProcPtr; { ! #if !defined(__WIN32__) /* UNIX */ tclStubs.tcl_CreateFileHandler = notifierProcPtr->createFileHandlerProc; tclStubs.tcl_DeleteFileHandler = notifierProcPtr->deleteFileHandlerProc; #endif --- 211,217 ---- Tcl_SetNotifier(notifierProcPtr) Tcl_NotifierProcs *notifierProcPtr; { ! #if !defined(WIN32) /* UNIX */ tclStubs.tcl_CreateFileHandler = notifierProcPtr->createFileHandlerProc; tclStubs.tcl_DeleteFileHandler = notifierProcPtr->deleteFileHandlerProc; #endif *** generic/tclPathObj.c 7 Oct 2004 14:50:23 -0000 1.37 --- generic/tclPathObj.c 26 Oct 2004 18:38:09 -0000 *************** *** 1787,1793 **** absolutePath = Tcl_FSJoinToPath(useThisCwd, 1, &absolutePath); Tcl_IncrRefCount(absolutePath); /* We have a refCount on the cwd */ ! #ifdef __WIN32__ } else if (type == TCL_PATH_VOLUME_RELATIVE) { /* Only Windows has volume-relative paths */ absolutePath = TclWinVolumeRelativeNormalize(interp, path, --- 1787,1793 ---- absolutePath = Tcl_FSJoinToPath(useThisCwd, 1, &absolutePath); Tcl_IncrRefCount(absolutePath); /* We have a refCount on the cwd */ ! #ifdef WIN32 } else if (type == TCL_PATH_VOLUME_RELATIVE) { /* Only Windows has volume-relative paths */ absolutePath = TclWinVolumeRelativeNormalize(interp, path, *************** *** 1795,1801 **** if (absolutePath == NULL) { return NULL; } ! #endif /* __WIN32__ */ } } --- 1795,1801 ---- if (absolutePath == NULL) { return NULL; } ! #endif /* WIN32 */ } } *************** *** 2281,2287 **** transPtr = Tcl_FSJoinToPath(pathPtr, 0, NULL); } ! #if defined(__CYGWIN__) && defined(__WIN32__) { extern int cygwin_conv_to_win32_path(CONST char *, char *); char winbuf[MAX_PATH+1]; --- 2281,2287 ---- transPtr = Tcl_FSJoinToPath(pathPtr, 0, NULL); } ! #if defined(__CYGWIN__) && defined(WIN32) { extern int cygwin_conv_to_win32_path(CONST char *, char *); char winbuf[MAX_PATH+1]; *************** *** 2300,2306 **** Tcl_SetStringObj(transPtr, winbuf, -1); } } ! #endif /* __CYGWIN__ && __WIN32__ */ /* * Now we have a translated filename in 'transPtr'. This will have --- 2300,2306 ---- Tcl_SetStringObj(transPtr, winbuf, -1); } } ! #endif /* __CYGWIN__ && WIN32 */ /* * Now we have a translated filename in 'transPtr'. This will have *** generic/tclPlatDecls.h 7 Jun 2004 16:48:45 -0000 1.23 --- generic/tclPlatDecls.h 26 Oct 2004 18:38:12 -0000 *************** *** 17,23 **** */ #if defined(__CYGWIN__) typedef char TCHAR; ! #elif defined(__WIN32__) && !defined(_TCHAR_DEFINED) # include # ifndef _TCHAR_DEFINED /* Borland seems to forget to set this. */ --- 17,23 ---- */ #if defined(__CYGWIN__) typedef char TCHAR; ! #elif defined(WIN32) && !defined(_TCHAR_DEFINED) # include # ifndef _TCHAR_DEFINED /* Borland seems to forget to set this. */ *************** *** 36,42 **** * Exported function declarations: */ ! #ifdef __WIN32__ #ifndef Tcl_WinUtfToTChar_TCL_DECLARED #define Tcl_WinUtfToTChar_TCL_DECLARED /* 0 */ --- 36,42 ---- * Exported function declarations: */ ! #ifdef WIN32 #ifndef Tcl_WinUtfToTChar_TCL_DECLARED #define Tcl_WinUtfToTChar_TCL_DECLARED /* 0 */ *************** *** 49,55 **** EXTERN char * Tcl_WinTCharToUtf _ANSI_ARGS_((CONST TCHAR * str, int len, Tcl_DString * dsPtr)); #endif ! #endif /* __WIN32__ */ #ifdef MAC_OSX_TCL #ifndef Tcl_MacOSXOpenBundleResources_TCL_DECLARED #define Tcl_MacOSXOpenBundleResources_TCL_DECLARED --- 49,55 ---- EXTERN char * Tcl_WinTCharToUtf _ANSI_ARGS_((CONST TCHAR * str, int len, Tcl_DString * dsPtr)); #endif ! #endif /* WIN32 */ #ifdef MAC_OSX_TCL #ifndef Tcl_MacOSXOpenBundleResources_TCL_DECLARED #define Tcl_MacOSXOpenBundleResources_TCL_DECLARED *************** *** 74,83 **** int magic; struct TclPlatStubHooks *hooks; ! #ifdef __WIN32__ TCHAR * (*tcl_WinUtfToTChar) _ANSI_ARGS_((CONST char * str, int len, Tcl_DString * dsPtr)); /* 0 */ char * (*tcl_WinTCharToUtf) _ANSI_ARGS_((CONST TCHAR * str, int len, Tcl_DString * dsPtr)); /* 1 */ ! #endif /* __WIN32__ */ #ifdef MAC_OSX_TCL int (*tcl_MacOSXOpenBundleResources) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * bundleName, int hasResourceFile, int maxPathLen, char * libraryPath)); /* 0 */ int (*tcl_MacOSXOpenVersionedBundleResources) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * bundleName, CONST char * bundleVersion, int hasResourceFile, int maxPathLen, char * libraryPath)); /* 1 */ --- 74,83 ---- int magic; struct TclPlatStubHooks *hooks; ! #ifdef WIN32 TCHAR * (*tcl_WinUtfToTChar) _ANSI_ARGS_((CONST char * str, int len, Tcl_DString * dsPtr)); /* 0 */ char * (*tcl_WinTCharToUtf) _ANSI_ARGS_((CONST TCHAR * str, int len, Tcl_DString * dsPtr)); /* 1 */ ! #endif /* WIN32 */ #ifdef MAC_OSX_TCL int (*tcl_MacOSXOpenBundleResources) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * bundleName, int hasResourceFile, int maxPathLen, char * libraryPath)); /* 0 */ int (*tcl_MacOSXOpenVersionedBundleResources) _ANSI_ARGS_((Tcl_Interp * interp, CONST char * bundleName, CONST char * bundleVersion, int hasResourceFile, int maxPathLen, char * libraryPath)); /* 1 */ *************** *** 98,104 **** * Inline function declarations: */ ! #ifdef __WIN32__ #ifndef Tcl_WinUtfToTChar #define Tcl_WinUtfToTChar \ (tclPlatStubsPtr->tcl_WinUtfToTChar) /* 0 */ --- 98,104 ---- * Inline function declarations: */ ! #ifdef WIN32 #ifndef Tcl_WinUtfToTChar #define Tcl_WinUtfToTChar \ (tclPlatStubsPtr->tcl_WinUtfToTChar) /* 0 */ *************** *** 107,113 **** #define Tcl_WinTCharToUtf \ (tclPlatStubsPtr->tcl_WinTCharToUtf) /* 1 */ #endif ! #endif /* __WIN32__ */ #ifdef MAC_OSX_TCL #ifndef Tcl_MacOSXOpenBundleResources #define Tcl_MacOSXOpenBundleResources \ --- 107,113 ---- #define Tcl_WinTCharToUtf \ (tclPlatStubsPtr->tcl_WinTCharToUtf) /* 1 */ #endif ! #endif /* WIN32 */ #ifdef MAC_OSX_TCL #ifndef Tcl_MacOSXOpenBundleResources #define Tcl_MacOSXOpenBundleResources \ *** generic/tclPort.h 24 Apr 2004 05:59:18 -0000 1.9 --- generic/tclPort.h 26 Oct 2004 18:38:16 -0000 *************** *** 18,24 **** #include "tcl.h" ! #if defined(__WIN32__) # include "tclWinPort.h" #else # include "tclUnixPort.h" --- 18,24 ---- #include "tcl.h" ! #if defined(WIN32) # include "tclWinPort.h" #else # include "tclUnixPort.h" *** generic/tclStubInit.c 14 Oct 2004 15:06:03 -0000 1.105 --- generic/tclStubInit.c 26 Oct 2004 18:38:21 -0000 *************** *** 74,94 **** TclAccessInsertProc, /* 2 */ TclAllocateFreeObjects, /* 3 */ NULL, /* 4 */ ! #if !defined(__WIN32__) /* UNIX */ TclCleanupChildren, /* 5 */ #endif /* UNIX */ ! #ifdef __WIN32__ TclCleanupChildren, /* 5 */ ! #endif /* __WIN32__ */ TclCleanupCommand, /* 6 */ TclCopyAndCollapse, /* 7 */ TclCopyChannel, /* 8 */ ! #if !defined(__WIN32__) /* UNIX */ TclCreatePipeline, /* 9 */ #endif /* UNIX */ ! #ifdef __WIN32__ TclCreatePipeline, /* 9 */ ! #endif /* __WIN32__ */ TclCreateProc, /* 10 */ TclDeleteCompiledLocalVars, /* 11 */ TclDeleteVars, /* 12 */ --- 74,94 ---- TclAccessInsertProc, /* 2 */ TclAllocateFreeObjects, /* 3 */ NULL, /* 4 */ ! #if !defined(WIN32) /* UNIX */ TclCleanupChildren, /* 5 */ #endif /* UNIX */ ! #ifdef WIN32 TclCleanupChildren, /* 5 */ ! #endif /* WIN32 */ TclCleanupCommand, /* 6 */ TclCopyAndCollapse, /* 7 */ TclCopyChannel, /* 8 */ ! #if !defined(WIN32) /* UNIX */ TclCreatePipeline, /* 9 */ #endif /* UNIX */ ! #ifdef WIN32 TclCreatePipeline, /* 9 */ ! #endif /* WIN32 */ TclCreateProc, /* 10 */ TclDeleteCompiledLocalVars, /* 11 */ TclDeleteVars, /* 12 */ *************** *** 183,194 **** TclSetPreInitScript, /* 101 */ TclSetupEnv, /* 102 */ TclSockGetPort, /* 103 */ ! #if !defined(__WIN32__) /* UNIX */ TclSockMinimumBuffers, /* 104 */ #endif /* UNIX */ ! #ifdef __WIN32__ TclSockMinimumBuffers, /* 104 */ ! #endif /* __WIN32__ */ NULL, /* 105 */ TclStatDeleteProc, /* 106 */ TclStatInsertProc, /* 107 */ --- 183,194 ---- TclSetPreInitScript, /* 101 */ TclSetupEnv, /* 102 */ TclSockGetPort, /* 103 */ ! #if !defined(WIN32) /* UNIX */ TclSockMinimumBuffers, /* 104 */ #endif /* UNIX */ ! #ifdef WIN32 TclSockMinimumBuffers, /* 104 */ ! #endif /* WIN32 */ NULL, /* 105 */ TclStatDeleteProc, /* 106 */ TclStatInsertProc, /* 107 */ *************** *** 289,295 **** TclIntPlatStubs tclIntPlatStubs = { TCL_STUB_MAGIC, NULL, ! #if !defined(__WIN32__) /* UNIX */ TclGetAndDetachPids, /* 0 */ TclpCloseFile, /* 1 */ TclpCreateCommandChannel, /* 2 */ --- 289,295 ---- TclIntPlatStubs tclIntPlatStubs = { TCL_STUB_MAGIC, NULL, ! #if !defined(WIN32) /* UNIX */ TclGetAndDetachPids, /* 0 */ TclpCloseFile, /* 1 */ TclpCreateCommandChannel, /* 2 */ *************** *** 306,312 **** TclpInetNtoa, /* 13 */ TclUnixCopyFile, /* 14 */ #endif /* UNIX */ ! #ifdef __WIN32__ TclWinConvertError, /* 0 */ TclWinConvertWSAError, /* 1 */ TclWinGetServByName, /* 2 */ --- 306,312 ---- TclpInetNtoa, /* 13 */ TclUnixCopyFile, /* 14 */ #endif /* UNIX */ ! #ifdef WIN32 TclWinConvertError, /* 0 */ TclWinConvertWSAError, /* 1 */ TclWinGetServByName, /* 2 */ *************** *** 337,343 **** TclWinFlushDirtyChannels, /* 27 */ TclWinResetInterfaces, /* 28 */ TclWinCPUID, /* 29 */ ! #endif /* __WIN32__ */ #ifdef MAC_OSX_TCL TclMacOSXGetFileAttribute, /* 15 */ TclMacOSXSetFileAttribute, /* 16 */ --- 337,343 ---- TclWinFlushDirtyChannels, /* 27 */ TclWinResetInterfaces, /* 28 */ TclWinCPUID, /* 29 */ ! #endif /* WIN32 */ #ifdef MAC_OSX_TCL TclMacOSXGetFileAttribute, /* 15 */ TclMacOSXSetFileAttribute, /* 16 */ *************** *** 348,357 **** TclPlatStubs tclPlatStubs = { TCL_STUB_MAGIC, NULL, ! #ifdef __WIN32__ Tcl_WinUtfToTChar, /* 0 */ Tcl_WinTCharToUtf, /* 1 */ ! #endif /* __WIN32__ */ #ifdef MAC_OSX_TCL Tcl_MacOSXOpenBundleResources, /* 0 */ Tcl_MacOSXOpenVersionedBundleResources, /* 1 */ --- 348,357 ---- TclPlatStubs tclPlatStubs = { TCL_STUB_MAGIC, NULL, ! #ifdef WIN32 Tcl_WinUtfToTChar, /* 0 */ Tcl_WinTCharToUtf, /* 1 */ ! #endif /* WIN32 */ #ifdef MAC_OSX_TCL Tcl_MacOSXOpenBundleResources, /* 0 */ Tcl_MacOSXOpenVersionedBundleResources, /* 1 */ *************** *** 376,393 **** Tcl_DbCkalloc, /* 6 */ Tcl_DbCkfree, /* 7 */ Tcl_DbCkrealloc, /* 8 */ ! #if !defined(__WIN32__) /* UNIX */ Tcl_CreateFileHandler, /* 9 */ #endif /* UNIX */ ! #ifdef __WIN32__ NULL, /* 9 */ ! #endif /* __WIN32__ */ ! #if !defined(__WIN32__) /* UNIX */ Tcl_DeleteFileHandler, /* 10 */ #endif /* UNIX */ ! #ifdef __WIN32__ NULL, /* 10 */ ! #endif /* __WIN32__ */ Tcl_SetTimer, /* 11 */ Tcl_Sleep, /* 12 */ Tcl_WaitForEvent, /* 13 */ --- 376,393 ---- Tcl_DbCkalloc, /* 6 */ Tcl_DbCkfree, /* 7 */ Tcl_DbCkrealloc, /* 8 */ ! #if !defined(WIN32) /* UNIX */ Tcl_CreateFileHandler, /* 9 */ #endif /* UNIX */ ! #ifdef WIN32 NULL, /* 9 */ ! #endif /* WIN32 */ ! #if !defined(WIN32) /* UNIX */ Tcl_DeleteFileHandler, /* 10 */ #endif /* UNIX */ ! #ifdef WIN32 NULL, /* 10 */ ! #endif /* WIN32 */ Tcl_SetTimer, /* 11 */ Tcl_Sleep, /* 12 */ Tcl_WaitForEvent, /* 13 */ *************** *** 488,499 **** Tcl_DeleteHashEntry, /* 108 */ Tcl_DeleteHashTable, /* 109 */ Tcl_DeleteInterp, /* 110 */ ! #if !defined(__WIN32__) /* UNIX */ Tcl_DetachPids, /* 111 */ #endif /* UNIX */ ! #ifdef __WIN32__ Tcl_DetachPids, /* 111 */ ! #endif /* __WIN32__ */ Tcl_DeleteTimerHandler, /* 112 */ Tcl_DeleteTrace, /* 113 */ Tcl_DontCallWhenDeleted, /* 114 */ --- 488,499 ---- Tcl_DeleteHashEntry, /* 108 */ Tcl_DeleteHashTable, /* 109 */ Tcl_DeleteInterp, /* 110 */ ! #if !defined(WIN32) /* UNIX */ Tcl_DetachPids, /* 111 */ #endif /* UNIX */ ! #ifdef WIN32 Tcl_DetachPids, /* 111 */ ! #endif /* WIN32 */ Tcl_DeleteTimerHandler, /* 112 */ Tcl_DeleteTrace, /* 113 */ Tcl_DontCallWhenDeleted, /* 114 */ *************** *** 549,560 **** Tcl_GetMaster, /* 164 */ Tcl_GetNameOfExecutable, /* 165 */ Tcl_GetObjResult, /* 166 */ ! #if !defined(__WIN32__) /* UNIX */ Tcl_GetOpenFile, /* 167 */ #endif /* UNIX */ ! #ifdef __WIN32__ NULL, /* 167 */ ! #endif /* __WIN32__ */ Tcl_GetPathType, /* 168 */ Tcl_Gets, /* 169 */ Tcl_GetsObj, /* 170 */ --- 549,560 ---- Tcl_GetMaster, /* 164 */ Tcl_GetNameOfExecutable, /* 165 */ Tcl_GetObjResult, /* 166 */ ! #if !defined(WIN32) /* UNIX */ Tcl_GetOpenFile, /* 167 */ #endif /* UNIX */ ! #ifdef WIN32 NULL, /* 167 */ ! #endif /* WIN32 */ Tcl_GetPathType, /* 168 */ Tcl_Gets, /* 169 */ Tcl_GetsObj, /* 170 */ *************** *** 584,595 **** Tcl_NotifyChannel, /* 194 */ Tcl_ObjGetVar2, /* 195 */ Tcl_ObjSetVar2, /* 196 */ ! #if !defined(__WIN32__) /* UNIX */ Tcl_OpenCommandChannel, /* 197 */ #endif /* UNIX */ ! #ifdef __WIN32__ Tcl_OpenCommandChannel, /* 197 */ ! #endif /* __WIN32__ */ Tcl_OpenFileChannel, /* 198 */ Tcl_OpenTcpClient, /* 199 */ Tcl_OpenTcpServer, /* 200 */ --- 584,595 ---- Tcl_NotifyChannel, /* 194 */ Tcl_ObjGetVar2, /* 195 */ Tcl_ObjSetVar2, /* 196 */ ! #if !defined(WIN32) /* UNIX */ Tcl_OpenCommandChannel, /* 197 */ #endif /* UNIX */ ! #ifdef WIN32 Tcl_OpenCommandChannel, /* 197 */ ! #endif /* WIN32 */ Tcl_OpenFileChannel, /* 198 */ Tcl_OpenTcpClient, /* 199 */ Tcl_OpenTcpServer, /* 200 */ *************** *** 599,610 **** Tcl_PosixError, /* 204 */ Tcl_QueueEvent, /* 205 */ Tcl_Read, /* 206 */ ! #if !defined(__WIN32__) /* UNIX */ Tcl_ReapDetachedProcs, /* 207 */ #endif /* UNIX */ ! #ifdef __WIN32__ Tcl_ReapDetachedProcs, /* 207 */ ! #endif /* __WIN32__ */ Tcl_RecordAndEval, /* 208 */ Tcl_RecordAndEvalObj, /* 209 */ Tcl_RegisterChannel, /* 210 */ --- 599,610 ---- Tcl_PosixError, /* 204 */ Tcl_QueueEvent, /* 205 */ Tcl_Read, /* 206 */ ! #if !defined(WIN32) /* UNIX */ Tcl_ReapDetachedProcs, /* 207 */ #endif /* UNIX */ ! #ifdef WIN32 Tcl_ReapDetachedProcs, /* 207 */ ! #endif /* WIN32 */ Tcl_RecordAndEval, /* 208 */ Tcl_RecordAndEvalObj, /* 209 */ Tcl_RegisterChannel, /* 210 */ *** generic/tclTest.c 7 Oct 2004 22:01:18 -0000 1.85 --- generic/tclTest.c 26 Oct 2004 18:38:29 -0000 *************** *** 2452,2458 **** static CONST char *platformStrings[] = { "unix", "mac", "windows" }; TclPlatformType *platform; ! #ifdef __WIN32__ platform = TclWinGetPlatform(); #else platform = &tclPlatform; --- 2452,2458 ---- static CONST char *platformStrings[] = { "unix", "mac", "windows" }; TclPlatformType *platform; ! #ifdef WIN32 platform = TclWinGetPlatform(); #else platform = &tclPlatform; *************** *** 3692,3698 **** size_t length; TclPlatformType *platform; ! #ifdef __WIN32__ platform = TclWinGetPlatform(); #else platform = &tclPlatform; --- 3692,3698 ---- size_t length; TclPlatformType *platform; ! #ifdef WIN32 platform = TclWinGetPlatform(); #else platform = &tclPlatform; *** tools/genStubs.tcl 17 Mar 2004 18:14:18 -0000 1.17 --- tools/genStubs.tcl 26 Oct 2004 18:38:35 -0000 *************** *** 218,227 **** proc genStubs::addPlatformGuard {plat text} { switch $plat { win { ! return "#ifdef __WIN32__\n${text}#endif /* __WIN32__ */\n" } unix { ! return "#if !defined(__WIN32__) /* UNIX */\n${text}#endif /* UNIX */\n" } macosx { return "#ifdef MAC_OSX_TCL\n${text}#endif /* MAC_OSX_TCL */\n" --- 218,227 ---- proc genStubs::addPlatformGuard {plat text} { switch $plat { win { ! return "#ifdef WIN32\n${text}#endif /* WIN32 */\n" } unix { ! return "#if !defined(WIN32) /* UNIX */\n${text}#endif /* UNIX */\n" } macosx { return "#ifdef MAC_OSX_TCL\n${text}#endif /* MAC_OSX_TCL */\n" *************** *** 230,236 **** return "#ifdef MAC_OSX_TK\n${text}#endif /* MAC_OSX_TK */\n" } x11 { ! return "#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */\n${text}#endif /* X11 */\n" } } return "$text" --- 230,236 ---- return "#ifdef MAC_OSX_TK\n${text}#endif /* MAC_OSX_TK */\n" } x11 { ! return "#if !(defined(WIN32) || defined(MAC_OSX_TK)) /* X11 */\n${text}#endif /* X11 */\n" } } return "$text" *** win/tclWin32Dll.c 1 Sep 2004 17:41:03 -0000 1.39 --- win/tclWin32Dll.c 26 Oct 2004 18:38:47 -0000 *************** *** 243,249 **** /* We will need this below */ extern Tcl_FSDupInternalRepProc TclNativeDupInternalRep; ! #ifdef __WIN32__ #ifndef STATIC_BUILD --- 243,249 ---- /* We will need this below */ extern Tcl_FSDupInternalRepProc TclNativeDupInternalRep; ! #ifdef WIN32 #ifndef STATIC_BUILD *************** *** 409,415 **** #endif /* !STATIC_BUILD */ ! #endif /* __WIN32__ */ /* *---------------------------------------------------------------------- --- 409,415 ---- #endif /* !STATIC_BUILD */ ! #endif /* WIN32 */ /* *----------------------------------------------------------------------