[PATCH] xkbcommon-keysyms: add header protection

David Herrmann dh.herrmann at googlemail.com
Tue Sep 11 08:23:17 PDT 2012

As there is currently no stable release of xkbcommon, other projects might
want to include a copy of the keysyms so they can be used even though
libxkbcommon may not be available on the machine. However, if xkbcommon.h
is still included, conflicts will occur. Hence, to avoid nasty hacks,
simply include a header protection in xkbcommon upstream.

Signed-off-by: David Herrmann <dh.herrmann at googlemail.com>
 xkbcommon/xkbcommon-keysyms.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xkbcommon/xkbcommon-keysyms.h b/xkbcommon/xkbcommon-keysyms.h
index 2c1ab95..e3ec868 100644
--- a/xkbcommon/xkbcommon-keysyms.h
+++ b/xkbcommon/xkbcommon-keysyms.h
@@ -112,6 +112,9 @@ SOFTWARE.
 #define XKB_KEY_NoSymbol                    0x000000  /* Special KeySym */
 #define XKB_KEY_VoidSymbol                  0xffffff  /* Void symbol */
@@ -2993,3 +2996,4 @@ performance, or use of this material.
 #define XKB_KEY_longminus            0x100000f6
 #define XKB_KEY_block                0x100000fc
+#endif /* _XKBCOMMON_KEYSYMS_H */

More information about the wayland-devel mailing list