[clutter/wip/wayland: 9/10] build: make internal option_xkb_* symbols static
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/wip/wayland: 9/10] build: make internal option_xkb_* symbols static
- Date: Tue, 6 Dec 2011 22:05:59 +0000 (UTC)
commit 72fc97ab355b07b0f254b973cc24f0e8e849e47d
Author: Robert Bragg <robert linux intel com>
Date: Tue Dec 6 21:49:15 2011 +0000
build: make internal option_xkb_* symbols static
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.
clutter/evdev/clutter-device-manager-evdev.c | 6 +++---
clutter/wayland/clutter-device-manager-wayland.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/evdev/clutter-device-manager-evdev.c
index 5b8cfd8..9da5fd4 100644
--- a/clutter/evdev/clutter-device-manager-evdev.c
+++ b/clutter/evdev/clutter-device-manager-evdev.c
@@ -85,9 +85,9 @@ static const gchar *subsystems[] = { "input", NULL };
*/
-const char *option_xkb_layout = "us";
-const char *option_xkb_variant = "";
-const char *option_xkb_options = "";
+static const char *option_xkb_layout = "us";
+static const char *option_xkb_variant = "";
+static const char *option_xkb_options = "";
/*
* ClutterEventSource for reading input devices
diff --git a/clutter/wayland/clutter-device-manager-wayland.c b/clutter/wayland/clutter-device-manager-wayland.c
index 75fdf21..1282a9f 100644
--- a/clutter/wayland/clutter-device-manager-wayland.c
+++ b/clutter/wayland/clutter-device-manager-wayland.c
@@ -147,9 +147,9 @@ _clutter_device_manager_wayland_init (ClutterDeviceManagerWayland *self)
{
}
-const char *option_xkb_layout = "us";
-const char *option_xkb_variant = "";
-const char *option_xkb_options = "";
+static const char *option_xkb_layout = "us";
+static const char *option_xkb_variant = "";
+static const char *option_xkb_options = "";
void
_clutter_device_manager_wayland_add_input_group (ClutterDeviceManager *manager,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]