From 7ea047fc0b96639ee3df8d2ec4c7a3658e7d790a Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 30 Aug 2010 13:17:45 +0000 Subject: [PATCH] *GLCtrl fix git-svn-id: svn://ultimatepp.org/upp/trunk@2645 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/GLCtrl/GLCtrl.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/uppsrc/GLCtrl/GLCtrl.h b/uppsrc/GLCtrl/GLCtrl.h index f61a567de..90f5b3055 100644 --- a/uppsrc/GLCtrl/GLCtrl.h +++ b/uppsrc/GLCtrl/GLCtrl.h @@ -8,6 +8,8 @@ #define Display XDisplay #define Picture XPicture +#define Status int + #include #include @@ -15,6 +17,8 @@ #include #endif +#undef Status + #undef Picture #undef Time #undef Font