diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-22 21:39:55 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-22 22:30:21 +0200 |
| commit | eeffa03b51efaaa6361ef876bffa476e31598002 (patch) | |
| tree | 3873270f0ba9715a9c1228f22ba8af2a8d8c9806 | |
| parent | 3e11d7a6b89ed426257c1faa80fee08c97c2e388 (diff) | |
prex.h: remove String mangling
Change-Id: Idb74e75b4f3e499eb4a633605600f639fb87b728
| -rw-r--r-- | include/postx.h | 1 | ||||
| -rw-r--r-- | include/prex.h | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/include/postx.h b/include/postx.h index 7bce135d5a4f..88699c00887e 100644 --- a/include/postx.h +++ b/include/postx.h @@ -32,7 +32,6 @@ #undef BOOL #undef Font #undef Cursor -#undef String #undef KeyCode #undef Region #undef Icon diff --git a/include/prex.h b/include/prex.h index a37433d49800..fec9c624af5c 100644 --- a/include/prex.h +++ b/include/prex.h @@ -30,7 +30,6 @@ #define Boolean HIDE_XLIB_Boolean #define Font HIDE_XLIB_Font #define Icon HIDE_XLIB_Icon -#define String HIDE_XLIB_String /* Types from <X11/X.h> that clash, but we do use. */ #define Cursor XLIB_Cursor @@ -53,9 +52,6 @@ extern "C" { /* From <X11/Intrinsic.h> */ typedef unsigned long Pixel; -#undef String -#define String XLIB_String - #undef KeyCode #define KeyCode XLIB_KeyCode //undef in intrinsics |