diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-07-12 10:18:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-07-12 10:18:42 (GMT) |
| commit | 4e9d18aba55de86cb9b8d13f453b3c4c12ff1332 (patch) | |
| tree | 7eb600f0ccbc8b007e45222590d4f7a238b17d86 | |
| parent | 0cd9c30d1743734c0066502aafabdeabc71c1a1b (diff) | |
| parent | 657084d02ca6e4c669c19845645b72153bbea92d (diff) | |
| download | tk-4e9d18aba55de86cb9b8d13f453b3c4c12ff1332.zip tk-4e9d18aba55de86cb9b8d13f453b3c4c12ff1332.tar.gz tk-4e9d18aba55de86cb9b8d13f453b3c4c12ff1332.tar.bz2 | |
On Cygwin, don't duplicate TkPutImage definition in tkUnixPort.h, in stead bring it in though tkIntXlibDecls.h
| -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 |