summaryrefslogtreecommitdiffstats
path: root/generic/tkImgPhoto.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-29 12:45:47 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-05-29 12:45:47 (GMT)
commit1b8294a6f883fcb1217f9a95b0fe3fcd4c55a272 (patch)
tree12d4d15c3f59ae70b1113469422fb33b9039d700 /generic/tkImgPhoto.c
parent9ea605f06bdde8beed71761774f09a632d2fb100 (diff)
parentba34893472773623c15b6e7b5a6739213d6b4edf (diff)
downloadtk-1b8294a6f883fcb1217f9a95b0fe3fcd4c55a272.zip
tk-1b8294a6f883fcb1217f9a95b0fe3fcd4c55a272.tar.gz
tk-1b8294a6f883fcb1217f9a95b0fe3fcd4c55a272.tar.bz2
merge core-8-4-branch, still to be tested on Unix
Diffstat (limited to 'generic/tkImgPhoto.c')
-rw-r--r--generic/tkImgPhoto.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index b30ca30..85c7de5 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -23,6 +23,8 @@
#ifdef __WIN32__
#include "tkWinInt.h"
+#elif defined(__CYGWIN__)
+#include "tkUnixInt.h"
#endif
/*