diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-03 21:14:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-03 21:14:49 (GMT) |
| commit | 92a5dcb73c1f8c5e59e989e6e915eb8c5d4efcb7 (patch) | |
| tree | 3397ea71d16d4fb1b06c749597d85f3f35b2330e | |
| parent | 47d7aa4020e2cd163aeba6435d2a701ad48bee45 (diff) | |
| parent | 5eb15ad21fe5fc08b93ebb556b553af65f082ffc (diff) | |
| download | tcl-92a5dcb73c1f8c5e59e989e6e915eb8c5d4efcb7.zip tcl-92a5dcb73c1f8c5e59e989e6e915eb8c5d4efcb7.tar.gz tcl-92a5dcb73c1f8c5e59e989e6e915eb8c5d4efcb7.tar.bz2 | |
don't try to run the cpuid test when cpuid is not available
| -rw-r--r-- | generic/tclTest.c | 6 | ||||
| -rw-r--r-- | unix/tclUnixSock.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c index b4c5bb9..3f06be0 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -419,9 +419,11 @@ static int TestNRELevels(ClientData clientData, static int TestInterpResolverCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); +#if defined(HAVE_CPUID) || defined(__WIN32__) static int TestcpuidCmd(ClientData dummy, Tcl_Interp* interp, int objc, Tcl_Obj *CONST objv[]); +#endif static const Tcl_Filesystem testReportingFilesystem = { "reporting", @@ -679,8 +681,10 @@ Tcltest_Init( NULL, NULL); Tcl_CreateCommand(interp, "testexitmainloop", TestexitmainloopCmd, NULL, NULL); +#if defined(HAVE_CPUID) || defined(__WIN32__) Tcl_CreateObjCommand(interp, "testcpuid", TestcpuidCmd, (ClientData) 0, NULL); +#endif t3ArgTypes[0] = TCL_EITHER; t3ArgTypes[1] = TCL_EITHER; Tcl_CreateMathFunc(interp, "T3", 2, t3ArgTypes, TestMathFunc2, @@ -6654,6 +6658,7 @@ TestNumUtfCharsCmd( return TCL_OK; } +#if defined(HAVE_CPUID) || defined(__WIN32__) /* *---------------------------------------------------------------------- * @@ -6707,6 +6712,7 @@ TestcpuidCmd( Tcl_SetObjResult(interp, Tcl_NewListObj(4, regsObjs)); return TCL_OK; } +#endif /* * Used to do basic checks of the TCL_HASH_KEY_SYSTEM_HASH flag diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c index 04cfe66..e48cc2b 100644 --- a/unix/tclUnixSock.c +++ b/unix/tclUnixSock.c @@ -24,6 +24,8 @@ #define SOCK_CHAN_LENGTH 4 + sizeof(void*) * 2 + 1 #define SOCK_TEMPLATE "sock%lx" +#undef SOCKET /* Possible conflict with win32 SOCKET */ + /* * This is needed to comply with the strict aliasing rules of GCC, but it also * simplifies casting between the different sockaddr types. |