diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-06 22:38:13 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-06 22:38:13 (GMT) |
| commit | 34455b2ccec84bccf8f6380ee8ac40637bf4b8f8 (patch) | |
| tree | d9ad95326825a71a929d3ee9fc22ddda9e7e02f8 /win/tkWinDraw.c | |
| parent | f61ecd111ced0ae28cf4b46da371fb0942ad2532 (diff) | |
| parent | edf582e29363915f6b8ea7954176768d8545934f (diff) | |
| download | tk-34455b2ccec84bccf8f6380ee8ac40637bf4b8f8.zip tk-34455b2ccec84bccf8f6380ee8ac40637bf4b8f8.tar.gz tk-34455b2ccec84bccf8f6380ee8ac40637bf4b8f8.tar.bz2 | |
some more cygwin compatibility improvements
format tk.decls like tcl8.5/8.6
Diffstat (limited to 'win/tkWinDraw.c')
| -rw-r--r-- | win/tkWinDraw.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/win/tkWinDraw.c b/win/tkWinDraw.c index 366fc61..64f2c72 100644 --- 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. |