diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-01 07:29:44 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-06-01 07:29:44 (GMT) |
| commit | 4609e36025d2dd05783233feac88c6cad06256df (patch) | |
| tree | 484ba0424611e0c71e26e80a7d5cd1ade9036fff | |
| parent | 0ad4cbd7bd60324dc875c7d8f472096589c2b024 (diff) | |
| download | tk-4609e36025d2dd05783233feac88c6cad06256df.zip tk-4609e36025d2dd05783233feac88c6cad06256df.tar.gz tk-4609e36025d2dd05783233feac88c6cad06256df.tar.bz2 | |
unbreak Linux build
| -rw-r--r-- | generic/tkIntXlibDecls.h | 11 | ||||
| -rw-r--r-- | unix/tkUnixPort.h | 9 |
2 files changed, 9 insertions, 11 deletions
diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index a613cf1..f4aa5f9 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -1270,15 +1270,4 @@ extern const TkIntXlibStubs *tkIntXlibStubsPtr; #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT -#if !(defined(__WIN32__) || defined(__CYGWIN__)) -/* - * The TkPutImage macro strips off the color table information, which isn't - * needed for X. - */ - -#define TkPutImage(colors, ncolors, display, pixels, gc, image, srcx, srcy, destx, desty, width, height) \ - XPutImage(display, pixels, gc, image, srcx, srcy, destx, \ - desty, width, height); -#endif - #endif /* _TKINTXLIBDECLS */ diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h index 93422cf..8118d95 100644 --- a/unix/tkUnixPort.h +++ b/unix/tkUnixPort.h @@ -126,6 +126,15 @@ # define WPARAM void * # define LPARAM void * # define LRESULT void * +#else +/* + * The TkPutImage macro strips off the color table information, which isn't + * needed for X. + */ + +#define TkPutImage(colors, ncolors, display, pixels, gc, image, srcx, srcy, destx, desty, width, height) \ + XPutImage(display, pixels, gc, image, srcx, srcy, destx, \ + desty, width, height); #endif /* |