mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix compilation warnings. need X11 headers before libkbd.h or else we get redefinition warnings

Browse Source
This commit is contained in:
Alan Pearson 2011-10-24 11:15:19 -07:00
parent e82fc535d2
commit 1b0cb473e3
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libfreerdp-kbd/layouts_xkb.c
View File

@ -21,6 +21,12 @@
#include <stdlib.h>
#include <string.h>
#ifdef WITH_XKBFILE
#include <X11/XKBlib.h>
#include <X11/extensions/XKBfile.h>
#include <X11/extensions/XKBrules.h>
#endif
#include "libkbd.h"
#include <freerdp/kbd/vkcodes.h>
#include "x_layout_id_table.h"
@ -33,10 +39,6 @@
#ifdef WITH_XKBFILE
#include <X11/XKBlib.h>
#include <X11/extensions/XKBfile.h>
#include <X11/extensions/XKBrules.h>
int init_xkb(void *dpy)
{
return XkbQueryExtension(dpy, NULL, NULL, NULL, NULL, NULL);
@ -368,6 +370,7 @@ void load_keyboard_map(KeycodeToVkcode keycodeToVkcode, char *xkbfile)
xkbfileEnd = xkbfile + strlen(xkbfile);
#ifdef __APPLE__
DEBUG_KBD("in apple keyboard hack");
/* Apple X11 breaks XKB detection */
keymapLoaded += load_xkb_keyboard(keycodeToVkcode, "macosx(macosx)");
#else