summaryrefslogtreecommitdiffstats
path: root/generic/tkInt.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2014-02-10 11:06:19 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2014-02-10 11:06:19 (GMT)
commitd015e4d8b48ad76acce178827f3ab114c330308c (patch)
tree75ae24370f3056d16427e5a17c5a9aaf6e1351e6 /generic/tkInt.h
parent3655db8b8d9c31f3253d97a9ea250b07641c24d9 (diff)
downloadtk-d015e4d8b48ad76acce178827f3ab114c330308c.zip
tk-d015e4d8b48ad76acce178827f3ab114c330308c.tar.gz
tk-d015e4d8b48ad76acce178827f3ab114c330308c.tar.bz2
Eliminate all usage of __WIN32__ macro: Some compilers (e.g. Clang/LLVM) don't define it, and _WIN32 is much more portable anyway.
See: [http://nadeausoftware.com/articles/2012/01/c_c_tip_how_use_compiler_predefined_macros_detect_operating_system#WindowsCygwinnonPOSIXandMinGW]
Diffstat (limited to 'generic/tkInt.h')
-rw-r--r--generic/tkInt.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h
index b48647d..b71e9b9 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -1216,7 +1216,7 @@ MODULE_SCOPE int TkInitFontchooser(Tcl_Interp *interp,
ClientData clientData);
MODULE_SCOPE void TkpWarpPointer(TkDisplay *dispPtr);
-#ifdef __WIN32__
+#ifdef _WIN32
#define TkParseColor XParseColor
#else
MODULE_SCOPE Status TkParseColor (Display * display,
@@ -1242,7 +1242,7 @@ MODULE_SCOPE int SquareObjCmd(ClientData clientData,
Tcl_Interp *interp, int objc,
Tcl_Obj * const objv[]);
MODULE_SCOPE int TkOldTestInit(Tcl_Interp *interp);
-#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
+#if !(defined(_WIN32) || defined(MAC_OSX_TK))
#define TkplatformtestInit(x) TCL_OK
#else
MODULE_SCOPE int TkplatformtestInit(Tcl_Interp *interp);