diff options
Diffstat (limited to 'include/window.h')
| -rw-r--r-- | include/window.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/window.h b/include/window.h index 5c17f43be..c46714aab 100644 --- a/include/window.h +++ b/include/window.h @@ -161,6 +161,11 @@ extern void DestroySubwindows( #endif ); +/* Quartz support on Mac OS X uses the HIToolbox + framework whose ChangeWindowAttributes function conflicts here. */ +#ifdef __DARWIN__ +#define ChangeWindowAttributes Darwin_X_ChangeWindowAttributes +#endif extern int ChangeWindowAttributes( #if NeedFunctionPrototypes WindowPtr /*pWin*/, @@ -170,7 +175,14 @@ extern int ChangeWindowAttributes( #endif ); +/* Quartz support on Mac OS X uses the HIToolbox + framework whose GetWindowAttributes function conflicts here. */ +#ifdef __DARWIN__ +#define GetWindowAttributes(w,c,x) Darwin_X_GetWindowAttributes(w,c,x) +extern void Darwin_X_GetWindowAttributes( +#else extern void GetWindowAttributes( +#endif #if NeedFunctionPrototypes WindowPtr /*pWin*/, ClientPtr /*client*/, |