mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prex.h: remove String mangling

Browse Source 
Change-Id: Idb74e75b4f3e499eb4a633605600f639fb87b728
This commit is contained in:
Michael Stahl 2013-10-22 21:39:55 +02:00
parent 3e11d7a6b8
commit eeffa03b51
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/postx.h
View File

@ -32,7 +32,6 @@
#undef BOOL #undef BOOL
#undef Font #undef Font
#undef Cursor #undef Cursor
#undef String
#undef KeyCode #undef KeyCode
#undef Region #undef Region
#undef Icon #undef Icon

4
include/prex.h
View File

@ -30,7 +30,6 @@
#define Boolean HIDE_XLIB_Boolean #define Boolean HIDE_XLIB_Boolean
#define Font HIDE_XLIB_Font #define Font HIDE_XLIB_Font
#define Icon HIDE_XLIB_Icon #define Icon HIDE_XLIB_Icon
#define String HIDE_XLIB_String
/* Types from <X11/X.h> that clash, but we do use. */ /* Types from <X11/X.h> that clash, but we do use. */
#define Cursor XLIB_Cursor #define Cursor XLIB_Cursor
@ -53,9 +52,6 @@ extern "C" {
/* From <X11/Intrinsic.h> */ /* From <X11/Intrinsic.h> */
typedef unsigned long Pixel; typedef unsigned long Pixel;
#undef String
#define String XLIB_String
#undef KeyCode #undef KeyCode
#define KeyCode XLIB_KeyCode //undef in intrinsics #define KeyCode XLIB_KeyCode //undef in intrinsics