From 423c4c60b59616fcebcd2f32bb3fcb38cd44f459 Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 30 Aug 2010 13:19:15 +0000 Subject: [PATCH] *GLCtrl (again) git-svn-id: svn://ultimatepp.org/upp/trunk@2646 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/GLCtrl/GLCtrl.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/uppsrc/GLCtrl/GLCtrl.h b/uppsrc/GLCtrl/GLCtrl.h index 90f5b3055..6b5c54f5b 100644 --- a/uppsrc/GLCtrl/GLCtrl.h +++ b/uppsrc/GLCtrl/GLCtrl.h @@ -3,26 +3,27 @@ #include +#ifdef PLATFORM_X11 #define Time XTime #define Font XFont #define Display XDisplay #define Picture XPicture - #define Status int +#endif #include #include #ifdef PLATFORM_X11 - #include -#endif + +#include #undef Status - #undef Picture #undef Time #undef Font #undef Display +#endif NAMESPACE_UPP