summaryrefslogtreecommitdiffstats
path: root/generic/tkPlatDecls.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)
commitca3d39ff5db486b96f9b003ff4548278629f8c61 (patch)
tree75ae24370f3056d16427e5a17c5a9aaf6e1351e6 /generic/tkPlatDecls.h
parent9de9697d3f35ba5859817ae84710decadeda45d6 (diff)
downloadtk-ca3d39ff5db486b96f9b003ff4548278629f8c61.zip
tk-ca3d39ff5db486b96f9b003ff4548278629f8c61.tar.gz
tk-ca3d39ff5db486b96f9b003ff4548278629f8c61.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/tkPlatDecls.h')
-rw-r--r--generic/tkPlatDecls.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h
index 88fa918..1e69c88 100644
--- a/generic/tkPlatDecls.h
+++ b/generic/tkPlatDecls.h
@@ -37,7 +37,7 @@ extern "C" {
* Exported function declarations:
*/
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
/* 0 */
EXTERN Window Tk_AttachHWND(Tk_Window tkwin, HWND hwnd);
/* 1 */
@@ -88,7 +88,7 @@ typedef struct TkPlatStubs {
int magic;
void *hooks;
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
Window (*tk_AttachHWND) (Tk_Window tkwin, HWND hwnd); /* 0 */
HINSTANCE (*tk_GetHINSTANCE) (void); /* 1 */
HWND (*tk_GetHWND) (Window window); /* 2 */
@@ -123,7 +123,7 @@ extern const TkPlatStubs *tkPlatStubsPtr;
* Inline function declarations:
*/
-#if defined(__WIN32__) || defined(__CYGWIN__) /* WIN */
+#if defined(_WIN32) || defined(__CYGWIN__) /* WIN */
#define Tk_AttachHWND \
(tkPlatStubsPtr->tk_AttachHWND) /* 0 */
#define Tk_GetHINSTANCE \