Move cpuid testcase from win-specific to generic tests

Simplify stub tables for functions which work on both UNIX and windows

1 files changed, 18 insertions, 63 deletions

diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 3b39416..1ed349c 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -70,12 +70,6 @@ int TclSockMinimumBuffersOld(sock, size)
 #endif
 
 #ifdef __CYGWIN__
-
-/* Trick, so we don't have to include <windows.h> here, which
- * - b.t.w. - lacks this function anyway */
-#define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS 0x00000004
-int __stdcall GetModuleHandleExW(unsigned int, const char *, void *);
-
 #define TclWinGetPlatformId winGetPlatformId
 #define Tcl_WinUtfToTChar winUtfToTChar
 #define Tcl_WinTCharToUtf winTCharToUtf
@@ -102,6 +96,12 @@ TclWinGetPlatformId()
     return 2; /* VER_PLATFORM_WIN32_NT */;
 }
 
+EXTERN TclPlatformType *
+TclWinGetPlatform()
+{
+    return &tclPlatform;
+}
+
 static void *TclWinGetTclInstance()
 {
     void *hInstance = NULL;
@@ -202,6 +202,7 @@ Tcl_WinTCharToUtf(
 #elif !defined(__WIN32__) /* UNIX and MAC */
 #   define TclWinConvertError (void (*) _ANSI_ARGS_((unsigned int))) TclGetAndDetachPids
 #   define TclWinConvertWSAError (void (*) _ANSI_ARGS_((unsigned int))) TclpCloseFile
+#   define TclWinGetPlatform 0
 #   define TclWinGetPlatformId (int (*)()) TclpCreateTempFile
 #   define TclWinGetTclInstance (void *(*)()) TclpCreateProcess
 #   define TclWinNToHS (unsigned short (*) _ANSI_ARGS_((unsigned short ns))) TclpMakeFile
@@ -226,6 +227,16 @@ Tcl_WinTCharToUtf(
 #   define TclpGmtime_unix TclpGmtime
 #endif
 
+#ifdef MAC_TCL
+#define Tcl_DetachPids 0
+#define Tcl_OpenCommandChannel 0
+#define Tcl_ReapDetachedProcs 0
+#define TclCleanupChildren 0
+#define TclCreatePipeline 0
+#define TclSockMinimumBuffersOld 0
+#define TclSockMinimumBuffers 0
+#endif
+
 /*
  * WARNING: The contents of this file is automatically generated by the
  * tools/genStubs.tcl script. Any modifications to the function declarations
@@ -242,27 +253,11 @@ TclIntStubs tclIntStubs = {
     TclAccessInsertProc, /* 2 */
     TclAllocateFreeObjects, /* 3 */
     NULL, /* 4 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    TclCleanupChildren, /* 5 */
-#endif /* UNIX */
-#ifdef __WIN32__
     TclCleanupChildren, /* 5 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    NULL, /* 5 */
-#endif /* MAC_TCL */
     TclCleanupCommand, /* 6 */
     TclCopyAndCollapse, /* 7 */
     TclCopyChannel, /* 8 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    TclCreatePipeline, /* 9 */
-#endif /* UNIX */
-#ifdef __WIN32__
     TclCreatePipeline, /* 9 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    NULL, /* 9 */
-#endif /* MAC_TCL */
     TclCreateProc, /* 10 */
     TclDeleteCompiledLocalVars, /* 11 */
     TclDeleteVars, /* 12 */
@@ -357,29 +352,13 @@ TclIntStubs tclIntStubs = {
     TclSetPreInitScript, /* 101 */
     TclSetupEnv, /* 102 */
     TclSockGetPort, /* 103 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    TclSockMinimumBuffersOld, /* 104 */
-#endif /* UNIX */
-#ifdef __WIN32__
     TclSockMinimumBuffersOld, /* 104 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    NULL, /* 104 */
-#endif /* MAC_TCL */
     NULL, /* 105 */
     TclStatDeleteProc, /* 106 */
     TclStatInsertProc, /* 107 */
     TclTeardownNamespace, /* 108 */
     TclUpdateReturnInfo, /* 109 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    TclSockMinimumBuffers, /* 110 */
-#endif /* UNIX */
-#ifdef __WIN32__
     TclSockMinimumBuffers, /* 110 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    NULL, /* 110 */
-#endif /* MAC_TCL */
     Tcl_AddInterpResolvers, /* 111 */
     Tcl_AppendExportList, /* 112 */
     Tcl_CreateNamespace, /* 113 */
@@ -500,7 +479,7 @@ TclIntPlatStubs tclIntPlatStubs = {
     TclpCreateTempFile, /* 22 */
     NULL, /* 23 */
     TclWinNoBackslash, /* 24 */
-    NULL, /* 25 */
+    TclWinGetPlatform, /* 25 */
     TclWinSetInterfaces, /* 26 */
     TclWinFlushDirtyChannels, /* 27 */
     TclWinResetInterfaces, /* 28 */
@@ -738,15 +717,7 @@ TclStubs tclStubs = {
     Tcl_DeleteHashEntry, /* 108 */
     Tcl_DeleteHashTable, /* 109 */
     Tcl_DeleteInterp, /* 110 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    Tcl_DetachPids, /* 111 */
-#endif /* UNIX */
-#ifdef __WIN32__
     Tcl_DetachPids, /* 111 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    NULL, /* 111 */
-#endif /* MAC_TCL */
     Tcl_DeleteTimerHandler, /* 112 */
     Tcl_DeleteTrace, /* 113 */
     Tcl_DontCallWhenDeleted, /* 114 */
@@ -840,15 +811,7 @@ TclStubs tclStubs = {
     Tcl_NotifyChannel, /* 194 */
     Tcl_ObjGetVar2, /* 195 */
     Tcl_ObjSetVar2, /* 196 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    Tcl_OpenCommandChannel, /* 197 */
-#endif /* UNIX */
-#ifdef __WIN32__
     Tcl_OpenCommandChannel, /* 197 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    NULL, /* 197 */
-#endif /* MAC_TCL */
     Tcl_OpenFileChannel, /* 198 */
     Tcl_OpenTcpClient, /* 199 */
     Tcl_OpenTcpServer, /* 200 */
@@ -858,15 +821,7 @@ TclStubs tclStubs = {
     Tcl_PosixError, /* 204 */
     Tcl_QueueEvent, /* 205 */
     Tcl_Read, /* 206 */
-#if !defined(__WIN32__) && !defined(MAC_TCL) /* UNIX */
-    Tcl_ReapDetachedProcs, /* 207 */
-#endif /* UNIX */
-#ifdef __WIN32__
     Tcl_ReapDetachedProcs, /* 207 */
-#endif /* __WIN32__ */
-#ifdef MAC_TCL
-    NULL, /* 207 */
-#endif /* MAC_TCL */
     Tcl_RecordAndEval, /* 208 */
     Tcl_RecordAndEvalObj, /* 209 */
     Tcl_RegisterChannel, /* 210 */