brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: make internal option_xkb_* symbols static

Browse Source 
This makes the option_xkb_* symbols declared for the evdev device manager
and the wayland device manager private so we don't get symbol collisions
if both of these backends are enabled.

Reviewed-by: Emmanuele Bassi <ebassi@linux.intel.com>
This commit is contained in:
Robert Bragg 2011-12-06 21:49:15 +00:00
parent fd8965a710
commit 3e85ad6b95
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clutter/evdev/clutter-device-manager-evdev.c
View File

@ -85,9 +85,9 @@ static const gchar *subsystems[] = { "input", NULL };
*/ */
const char *option_xkb_layout = "us"; static const char *option_xkb_layout = "us";
const char *option_xkb_variant = ""; static const char *option_xkb_variant = "";
const char *option_xkb_options = ""; static const char *option_xkb_options = "";
/* /*
* ClutterEventSource for reading input devices * ClutterEventSource for reading input devices

6
clutter/wayland/clutter-device-manager-wayland.c
View File

@ -147,9 +147,9 @@ _clutter_device_manager_wayland_init (ClutterDeviceManagerWayland *self)
{ {
} }
const char *option_xkb_layout = "us"; static const char *option_xkb_layout = "us";
const char *option_xkb_variant = ""; static const char *option_xkb_variant = "";
const char *option_xkb_options = ""; static const char *option_xkb_options = "";
void void
_clutter_device_manager_wayland_add_input_group (ClutterDeviceManager *manager, _clutter_device_manager_wayland_add_input_group (ClutterDeviceManager *manager,