summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavygrvy <davygrvy@pobox.com>2002-11-27 18:13:38 (GMT)
committerdavygrvy <davygrvy@pobox.com>2002-11-27 18:13:38 (GMT)
commit680bad22ac22236b7b1d5fb3deb4533dc0d17d53 (patch)
treeb36e1756ad9a99ec01ed52bd3d3604baef4bec78
parent32a836b0dd1bcb085ce086bfb8b12f0ac38d47ef (diff)
downloadtcl-680bad22ac22236b7b1d5fb3deb4533dc0d17d53.zip
tcl-680bad22ac22236b7b1d5fb3deb4533dc0d17d53.tar.gz
tcl-680bad22ac22236b7b1d5fb3deb4533dc0d17d53.tar.bz2
* win/tclWinPort.h: Don't turn off winsock prototypes!
TclX didn't like it. Even though the core doesn't use the prototypes, do offer them.
-rw-r--r--ChangeLog6
-rw-r--r--win/tclWinPort.h8
2 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d73e16..569e53c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-27 David Gravereaux <davygrvy@pobox.com>
+
+ * win/tclWinPort.h: Don't turn off winsock prototypes!
+ TclX didn't like it. Even though the core doesn't use the
+ prototypes, do offer them.
+
2002-11-26 Jeff Hobbs <jeffh@ActiveState.com>
* generic/tclEncoding.c (TclFinalizeEncodingSubsystem): properly
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index f0ba460..c553ea6 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinPort.h,v 1.35 2002/11/27 00:58:01 davygrvy Exp $
+ * RCS: @(#) $Id: tclWinPort.h,v 1.36 2002/11/27 18:13:38 davygrvy Exp $
*/
#ifndef _TCLWINPORT
@@ -70,12 +70,8 @@
#undef WIN32_LEAN_AND_MEAN
/*
- * Ask for the winsock function typedefs, only. wspiapi.h may be
- * included, 1) isn't used, and 2) can't cope with typedefs only.
- * This appears to be a bug in wspiapi.h, so make sure it is excluded.
+ * Ask for the winsock function typedefs, also.
*/
-#define _WSPIAPI_H_
-#define INCL_WINSOCK_API_PROTOTYPES 0
#define INCL_WINSOCK_API_TYPEDEFS 1
#include <winsock2.h>