summaryrefslogtreecommitdiffstats
path: root/win/tkWinDraw.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-06 22:04:03 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-06 22:04:03 (GMT)
commitedf582e29363915f6b8ea7954176768d8545934f (patch)
tree845dc4e8e220a3589692bbc862c9d74649410158 /win/tkWinDraw.c
parentca830add40b2f1d21998d01aa0a67b9d0d4dd275 (diff)
downloadtk-edf582e29363915f6b8ea7954176768d8545934f.zip
tk-edf582e29363915f6b8ea7954176768d8545934f.tar.gz
tk-edf582e29363915f6b8ea7954176768d8545934f.tar.bz2
some more cygwin compatibility improvements
Diffstat (limited to 'win/tkWinDraw.c')
-rwxr-xr-x[-rw-r--r--]win/tkWinDraw.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/win/tkWinDraw.c b/win/tkWinDraw.c
index d0a609f..805dde3 100644..100755
--- a/win/tkWinDraw.c
+++ b/win/tkWinDraw.c
@@ -24,7 +24,7 @@
* Translation table between X gc functions and Win32 raster op modes.
*/
-int tkpWinRopModes[] = {
+CONST int tkpWinRopModes[] = {
R2_BLACK, /* GXclear */
R2_MASKPEN, /* GXand */
R2_MASKPENNOT, /* GXandReverse */
@@ -55,7 +55,7 @@ int tkpWinRopModes[] = {
#define SRCORREVERSE (DWORD)0x00DD0228 /* dest = source OR (NOT dest) */
#define SRCNAND (DWORD)0x007700E6 /* dest = NOT (source AND dest) */
-int tkpWinBltModes[] = {
+CONST int tkpWinBltModes[] = {
BLACKNESS, /* GXclear */
SRCAND, /* GXand */
SRCERASE, /* GXandReverse */
@@ -93,9 +93,10 @@ int tkpWinBltModes[] = {
/*
* Macros used later in the file.
*/
-
-#define MIN(a,b) ((a>b) ? b : a)
-#define MAX(a,b) ((a<b) ? b : a)
+#ifndef MIN
+# define MIN(a,b) ((a>b) ? b : a)
+# define MAX(a,b) ((a<b) ? b : a)
+#endif
/*
* The followng typedef is used to pass Windows GDI drawing functions.