summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/postx.h1
-rw-r--r--include/prex.h4
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