diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-07-12 09:40:33 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-07-12 09:40:33 (GMT) |
| commit | 534e9ad20383eee85480e9b665c0431858ade025 (patch) | |
| tree | 0ddd2f665a59d34c8dec318ca3cf7676353449e0 | |
| parent | 59921494b1adc71f06c53c4a7574507908bb79e3 (diff) | |
| download | tk-534e9ad20383eee85480e9b665c0431858ade025.zip tk-534e9ad20383eee85480e9b665c0431858ade025.tar.gz tk-534e9ad20383eee85480e9b665c0431858ade025.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 b4f4e05..3fb3d29 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -530,7 +530,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 6e7a701..d122c8c 100644 --- a/unix/tkUnixPort.h +++ b/unix/tkUnixPort.h @@ -129,6 +129,7 @@ #endif #ifdef __CYGWIN__ +# include "tkIntXlibDecls.h" # define UINT unsigned int # define HWND void * # define HDC void * @@ -142,9 +143,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 |