diff options
| author | Ran Benita <ran234@gmail.com> | 2012-04-05 10:47:43 +0300 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2012-04-09 14:04:11 +0100 |
| commit | 18e6a6a43e4e4711eedc149875c064f3582948a7 (patch) | |
| tree | a702ae1ed0a89196d1516237cc46f346bafca674 /src/keysym.c | |
| parent | 073a21076c44aecb5439ce3cf884b3c04079d14c (diff) | |
| download | xorg-lib-libxkbcommon-18e6a6a43e4e4711eedc149875c064f3582948a7.tar.gz | |
Remove Xfuncproto.h and XKB.h from xkbcommon/xkbcommon.h
The kbproto header is already not needed here anymore.
Move the _X_EXPORT's to the corresponding function definitions, and use
straight extern "C" clauses instead of _XFUNCPROTOBEGIN/END.
It also makes more sense to have the EXPORT's in the source files, as it
provides some documentation to the reader, whereas in the header it's
obvious.
Signed-off-by: Ran Benita <ran234@gmail.com>
[daniels: Updated for xkb_keymap changes.]
Diffstat (limited to 'src/keysym.c')
| -rw-r--r-- | src/keysym.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/keysym.c b/src/keysym.c index add0b83..8f6515d 100644 --- a/src/keysym.c +++ b/src/keysym.c @@ -28,15 +28,16 @@ authorization from the authors. #ifdef HAVE_CONFIG_H #include <config.h> #endif -#include <X11/keysymdef.h> -#include "xkbmisc.h" -#include "xkbcommon/xkbcommon.h" #include <stdlib.h> +#include <stdio.h> #include <string.h> +#include <X11/keysymdef.h> #include "ks_tables.h" +#include "xkbmisc.h" +#include "xkbcommon/xkbcommon.h" -void +_X_EXPORT void xkb_keysym_to_string(xkb_keysym_t ks, char *buffer, size_t size) { int i, n, h, idx; @@ -90,7 +91,7 @@ xkb_keysym_to_string(xkb_keysym_t ks, char *buffer, size_t size) snprintf(buffer, size, "0x%08x", ks); } -xkb_keysym_t +_X_EXPORT xkb_keysym_t xkb_string_to_keysym(const char *s) { int i, n, h, c, idx; |