summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixSock.c
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)
commitc893af9ab3d749e0da5773949290b6c3befa3887 (patch)
tree3397ea71d16d4fb1b06c749597d85f3f35b2330e /unix/tclUnixSock.c
parent3fef46c2df37258c6baff5bc39a5e1d4dc14d0a4 (diff)
parent42c68869ca5af9ace61b1a28ec04c5981e82dcd0 (diff)
downloadtcl-c893af9ab3d749e0da5773949290b6c3befa3887.zip
tcl-c893af9ab3d749e0da5773949290b6c3befa3887.tar.gz
tcl-c893af9ab3d749e0da5773949290b6c3befa3887.tar.bz2
don't try to run the cpuid test when cpuid is not available
Diffstat (limited to 'unix/tclUnixSock.c')
-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.