diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-05-29 12:45:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2012-05-29 12:45:47 (GMT) |
| commit | 11d8c10238f4ad5d48dd3465d2ec39c26cc6147a (patch) | |
| tree | 12d4d15c3f59ae70b1113469422fb33b9039d700 /generic/tkIntDecls.h | |
| parent | 668b781d3f1f94884719b36eff9d3e04c276afb0 (diff) | |
| parent | b3c2ac38909466a3f130c650ff542029d443aabb (diff) | |
| download | tk-11d8c10238f4ad5d48dd3465d2ec39c26cc6147a.zip tk-11d8c10238f4ad5d48dd3465d2ec39c26cc6147a.tar.gz tk-11d8c10238f4ad5d48dd3465d2ec39c26cc6147a.tar.bz2 | |
merge core-8-4-branch, still to be tested on Unix
FossilOrigin-Name: 2f3e94911910b8da69ee682b48fe88b88daff416
Diffstat (limited to 'generic/tkIntDecls.h')
| -rw-r--r-- | generic/tkIntDecls.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index acb9639..7f1c096 100644 --- a/generic/tkIntDecls.h +++ b/generic/tkIntDecls.h @@ -1854,11 +1854,10 @@ extern TkIntStubs *tkIntStubsPtr; #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT +#ifndef __WIN32__ /* - * On X11, these macros are just wrappers for the equivalent X Region calls. + * These macros are just wrappers for the equivalent X Region calls. */ -#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ - #undef TkClipBox #undef TkCreateRegion #undef TkDestroyRegion @@ -1879,8 +1878,7 @@ extern TkIntStubs *tkIntStubsPtr; (Region) b, (Region) r) #define TkUnionRectWithRegion(rect, src, ret) XUnionRectWithRegion(rect, \ (Region) src, (Region) ret) - -#endif /* UNIX */ +#endif /* __WIN32__ */ #endif /* _TKINTDECLS */ |