summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-03 21:14:49 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-03 21:14:49 (GMT)
commit92a5dcb73c1f8c5e59e989e6e915eb8c5d4efcb7 (patch)
tree3397ea71d16d4fb1b06c749597d85f3f35b2330e /unix
parent47d7aa4020e2cd163aeba6435d2a701ad48bee45 (diff)
parent5eb15ad21fe5fc08b93ebb556b553af65f082ffc (diff)
downloadtcl-92a5dcb73c1f8c5e59e989e6e915eb8c5d4efcb7.zip
tcl-92a5dcb73c1f8c5e59e989e6e915eb8c5d4efcb7.tar.gz
tcl-92a5dcb73c1f8c5e59e989e6e915eb8c5d4efcb7.tar.bz2
don't try to run the cpuid test when cpuid is not available
Diffstat (limited to 'unix')
-rw-r--r--unix/tclUnixSock.c2
1 files changed, 2 insertions, 0 deletions
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.