summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-04-16 11:21:58 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-04-16 11:21:58 (GMT)
commit7c00be9c3811d243d3558ca7b51dceff54e182d0 (patch)
treed0d36f7e86dc3aed9b7f5ae03ea93d79ea41f528
parentf0f432af921a05f57a62cb9da7f6d9ed0f59492f (diff)
parentbe0324597aa8d46f7ad4f8608ba2644b40ffd504 (diff)
downloadtcl-7c00be9c3811d243d3558ca7b51dceff54e182d0.zip
tcl-7c00be9c3811d243d3558ca7b51dceff54e182d0.tar.gz
tcl-7c00be9c3811d243d3558ca7b51dceff54e182d0.tar.bz2
merge trunk
-rw-r--r--win/tclWinInit.c10
-rw-r--r--win/tclWinSock.c2
2 files changed, 6 insertions, 6 deletions
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index d90d57a..8b600f6 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -135,11 +135,11 @@ TclpInitPlatform(void)
tclPlatform = TCL_PLATFORM_WINDOWS;
- /*
- * Initialize the winsock library. On Windows XP and higher this
- * can never fail.
- */
- WSAStartup(wVersionRequested, &wsaData);
+ /*
+ * Initialize the winsock library. On Windows XP and higher this
+ * can never fail.
+ */
+ WSAStartup(wVersionRequested, &wsaData);
#ifdef STATIC_BUILD
/*
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 857a2b3..e4fc9a4 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -2414,7 +2414,7 @@ SocketThread(
*
* Side effects:
* The flags for the given socket are updated to reflect the event that
- * occured.
+ * occurred.
*
*----------------------------------------------------------------------
*/