diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-07-12 10:18:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2013-07-12 10:18:42 (GMT) |
| commit | c18ff320dadb2de0fb7fa21ef2dedf768f86979b (patch) | |
| tree | 7eb600f0ccbc8b007e45222590d4f7a238b17d86 | |
| parent | 7b34fd9a9450a327a341c581b40a1a609ca53fb5 (diff) | |
| parent | 48b6fc28f41ebf078ec717688cd02a6b28b56f19 (diff) | |
| download | tk-c18ff320dadb2de0fb7fa21ef2dedf768f86979b.zip tk-c18ff320dadb2de0fb7fa21ef2dedf768f86979b.tar.gz tk-c18ff320dadb2de0fb7fa21ef2dedf768f86979b.tar.bz2 | |
On Cygwin, don't duplicate TkPutImage definition in tkUnixPort.h, in stead bring it in though tkIntXlibDecls.h
FossilOrigin-Name: b96b92ac8ce2902e2c78ac522575df4507c478f6
| -rw-r--r-- | unix/Makefile.in | 2 | ||||
| -rw-r--r-- | unix/tkUnixPort.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 23df9dd..3914940 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -547,7 +547,7 @@ AQUA_XLIB_HDRS = $(XLIB_DIR)/X11/*.h $(XLIB_DIR)/xbytes.h AQUA_PRIVATE_HDRS = $(MAC_OSX_DIR)/tkMacOSXPort.h $(MAC_OSX_DIR)/tkMacOSXInt.h -X11_PRIVATE_HDRS = $(UNIX_DIR)/tkUnixPort.h $(UNIX_DIR)/tkUnixInt.h +X11_PRIVATE_HDRS = $(UNIX_DIR)/tkUnixPort.h $(UNIX_DIR)/tkUnixInt.h $(GENERIC_DIR)/tkIntXlibDecls.h # Currently private, eventually public TTK_HDRS = $(TTK_DIR)/ttkTheme.h $(TTK_DIR)/ttkDecls.h diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h index 222be88..9051c63 100644 --- a/unix/tkUnixPort.h +++ b/unix/tkUnixPort.h @@ -114,6 +114,7 @@ #endif #ifdef __CYGWIN__ +# include "tkIntXlibDecls.h" # define UINT unsigned int # define HWND void * # define HDC void * @@ -127,9 +128,6 @@ # define LPARAM void * # define LRESULT void * -EXTERN int TkPutImage (unsigned long *, int, Display *, Drawable, GC, - XImage *, int, int, int, int, unsigned int, unsigned int); - #else /* !__CYGWIN__ */ /* * The TkPutImage macro strips off the color table information, which isn't |