diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-23 22:22:32 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-08-23 22:33:30 +0300 |
| commit | 30ae83c268125383866d47a7ee3e4a5dfcf59f71 (patch) | |
| tree | ab52f8ecd7ed9517d70e13b22843b7948f20c9e9 /include/prex.h | |
| parent | 02f6c270e79879188b2be670c6db4feb56bb064e (diff) | |
fdo#82577: Handle KeyCode
Put the VCL KeyCode class in the vcl namespace. Avoids clash with the X11
KeyCode typedef.
Change-Id: I624c9d937f7c5f5986d313b6c5f060bd8bb7e028
Diffstat (limited to 'include/prex.h')
| -rw-r--r-- | include/prex.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/prex.h b/include/prex.h index 995e829b260f..6a0db3676e66 100644 --- a/include/prex.h +++ b/include/prex.h @@ -31,7 +31,6 @@ #define Icon HIDE_XLIB_Icon /* Types from <X11/X.h> that clash, but we do use. */ -#define KeyCode XLIB_KeyCode #define Region XLIB_Region #define Time XLIB_Time #define Window XLIB_Window @@ -50,9 +49,6 @@ extern "C" { /* From <X11/Intrinsic.h> */ typedef unsigned long Pixel; -#undef KeyCode -#define KeyCode XLIB_KeyCode //undef in intrinsics - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |