summaryrefslogtreecommitdiffstats
path: root/generic/tkCanvPs.c
diff options
context:
space:
mode:
authornijtmans@users.sourceforge.net <jan.nijtmans>2014-02-10 11:35:13 (GMT)
committernijtmans@users.sourceforge.net <jan.nijtmans>2014-02-10 11:35:13 (GMT)
commit1372fc20ed209a8cc4c9f7cddeba69758ae93dbb (patch)
treed75f1f89ded91bd4482049920ea3eb5d872cb848 /generic/tkCanvPs.c
parentf69a8efd19f322122bdd7c86ced45a8e334408e0 (diff)
downloadtk-1372fc20ed209a8cc4c9f7cddeba69758ae93dbb.zip
tk-1372fc20ed209a8cc4c9f7cddeba69758ae93dbb.tar.gz
tk-1372fc20ed209a8cc4c9f7cddeba69758ae93dbb.tar.bz2
Eliminate all usage of WIN32 macro as well: _WIN32 is the portable macro.
Diffstat (limited to 'generic/tkCanvPs.c')
-rw-r--r--generic/tkCanvPs.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkCanvPs.c b/generic/tkCanvPs.c
index 70fc457..c6470dd 100644
--- a/generic/tkCanvPs.c
+++ b/generic/tkCanvPs.c
@@ -1168,7 +1168,7 @@ GetPostscriptPoints(
*--------------------------------------------------------------
*/
-#ifdef WIN32
+#ifdef _WIN32
#include <windows.h>
/*
@@ -1178,15 +1178,15 @@ GetPostscriptPoints(
#define GetBValue(rgb) ((BYTE)((rgb)>>16))
*/
-#else /* !WIN32 */
+#else /* !_WIN32 */
#define GetRValue(rgb) ((rgb & cdata->red_mask) >> cdata->red_shift)
#define GetGValue(rgb) ((rgb & cdata->green_mask) >> cdata->green_shift)
#define GetBValue(rgb) ((rgb & cdata->blue_mask) >> cdata->blue_shift)
-#endif /* WIN32 */
+#endif /* _WIN32 */
-#if defined(WIN32) || defined(MAC_OSX_TK)
+#if defined(_WIN32) || defined(MAC_OSX_TK)
static void
TkImageGetColor(
TkColormapData *cdata, /* Colormap data */
@@ -1198,7 +1198,7 @@ TkImageGetColor(
*green = (double) GetGValue(pixel) / 255.0;
*blue = (double) GetBValue(pixel) / 255.0;
}
-#else /* ! (WIN32 || MAC_OSX_TK) */
+#else /* ! (_WIN32 || MAC_OSX_TK) */
static void
TkImageGetColor(
TkColormapData *cdata, /* Colormap data */
@@ -1220,7 +1220,7 @@ TkImageGetColor(
*blue = cdata->colors[pixel].blue / 65535.0;
}
}
-#endif /* WIN32 || MAC_OSX_TK */
+#endif /* _WIN32 || MAC_OSX_TK */
/*
*--------------------------------------------------------------