summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-07-12 09:40:33 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-07-12 09:40:33 (GMT)
commit657084d02ca6e4c669c19845645b72153bbea92d (patch)
tree0ddd2f665a59d34c8dec318ca3cf7676353449e0 /unix
parente27b92f00b4a5dbee54f2bb670e7d51c3b882526 (diff)
downloadtk-657084d02ca6e4c669c19845645b72153bbea92d.zip
tk-657084d02ca6e4c669c19845645b72153bbea92d.tar.gz
tk-657084d02ca6e4c669c19845645b72153bbea92d.tar.bz2
On Cygwin, don't duplicate TkPutImage definition in tkUnixPort.h, in stead bring it in though tkIntXlibDecls.h
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile.in2
-rw-r--r--unix/tkUnixPort.h4
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