summaryrefslogtreecommitdiffstats
path: root/generic/tkIntDecls.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/tkIntDecls.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/tkIntDecls.h')
-rw-r--r--generic/tkIntDecls.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h
index 3c37922..67a4f4b 100644
--- a/generic/tkIntDecls.h
+++ b/generic/tkIntDecls.h
@@ -676,20 +676,20 @@ typedef struct TkIntStubs {
void (*tkSetRegion) (Display *display, GC gc, TkRegion rgn); /* 118 */
void (*tkUnionRectWithRegion) (XRectangle *rect, TkRegion src, TkRegion dr_return); /* 119 */
void (*reserved120)(void);
-#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
void (*reserved121)(void);
#endif /* X11 */
-#if defined(__WIN32__) /* WIN */
+#if defined(_WIN32) /* WIN */
void (*reserved121)(void);
#endif /* WIN */
#ifdef MAC_OSX_TK /* AQUA */
void (*reserved121)(void); /* Dummy entry for stubs table backwards compatibility */
Pixmap (*tkpCreateNativeBitmap) (Display *display, const void *source); /* 121 */
#endif /* AQUA */
-#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
void (*reserved122)(void);
#endif /* X11 */
-#if defined(__WIN32__) /* WIN */
+#if defined(_WIN32) /* WIN */
void (*reserved122)(void);
#endif /* WIN */
#ifdef MAC_OSX_TK /* AQUA */
@@ -697,10 +697,10 @@ typedef struct TkIntStubs {
void (*tkpDefineNativeBitmaps) (void); /* 122 */
#endif /* AQUA */
void (*reserved123)(void);
-#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(_WIN32) || defined(MAC_OSX_TK)) /* X11 */
void (*reserved124)(void);
#endif /* X11 */
-#if defined(__WIN32__) /* WIN */
+#if defined(_WIN32) /* WIN */
void (*reserved124)(void);
#endif /* WIN */
#ifdef MAC_OSX_TK /* AQUA */
@@ -1150,7 +1150,7 @@ extern const TkIntStubs *tkIntStubsPtr;
/*
* On X11, these macros are just wrappers for the equivalent X Region calls.
*/
-#if !(defined(__WIN32__) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
+#if !(defined(_WIN32) || defined(__CYGWIN__) || defined(MAC_OSX_TK)) /* X11 */
#undef TkClipBox
#undef TkCreateRegion