diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2004-11-04 19:14:48 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2004-11-04 19:14:48 +0000 |
| commit | 3f15f54b9e9a14adf70060789427bfe08f8cf744 (patch) | |
| tree | 4c1b14d9413fff828a1361919de11282769d5e04 | |
| parent | 0880a28805a1138058923d24a5bc2b34f82c2022 (diff) | |
small prerelease polishv.1.11
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | libxklavier/xklavier_config_i18n.c | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/test_config.c | 2 | ||||
| -rw-r--r-- | tests/test_monitor.c | 3 |
5 files changed, 16 insertions, 6 deletions
@@ -1,3 +1,12 @@ +2004-11-04 19:00 svu + + * libxklavier/xklavier_config_i18n.c, + tests/Makefile.am, + tests/test_config.c, + tests/test_monitor.c: 64-bit compatibility patch from + James Henstridge. -Wall -Werror for tests. + + 2004-11-02 22:55 svu * libxklavier/Makefile.am, diff --git a/libxklavier/xklavier_config_i18n.c b/libxklavier/xklavier_config_i18n.c index 92fe440..e56938a 100644 --- a/libxklavier/xklavier_config_i18n.c +++ b/libxklavier/xklavier_config_i18n.c @@ -101,13 +101,13 @@ static Bool _XklGetCharset( const char **a ) char *_XklLocaleFromUtf8( const char *utf8string ) { - int len; + size_t len; iconv_t converter; static char converted[XKL_MAX_CI_DESC_LENGTH]; char *convertedStart = converted; char *utfStart = ( char * ) utf8string; - int clen = XKL_MAX_CI_DESC_LENGTH - 1; + size_t clen = XKL_MAX_CI_DESC_LENGTH - 1; const char *charset; static Bool alreadyWarned = False; diff --git a/tests/Makefile.am b/tests/Makefile.am index 70815c9..9d844da 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,7 +4,7 @@ test_config_SOURCES=test_config.c test_monitor_SOURCES=test_monitor.c -AM_CFLAGS=-I$(includedir) -I$(x_includes) -I$(top_srcdir) +AM_CFLAGS=-Wall -Werror -I$(includedir) -I$(x_includes) -I$(top_srcdir) -AM_LDFLAGS=$(top_builddir)/libxklavier/libxklavier.la -lX11 +AM_LDFLAGS=$(top_builddir)/libxklavier/libxklavier.la -L$(x_libraries) -lX11 diff --git a/tests/test_config.c b/tests/test_config.c index a91860c..ad2c4f0 100644 --- a/tests/test_config.c +++ b/tests/test_config.c @@ -1,6 +1,8 @@ #include <config.h> #include <stdio.h> #include <unistd.h> +#include <stdlib.h> +#include <string.h> #include <X11/Xlib.h> #include <libxklavier/xklavier.h> #include <libxklavier/xklavier_config.h> diff --git a/tests/test_monitor.c b/tests/test_monitor.c index 73c86d2..8808b62 100644 --- a/tests/test_monitor.c +++ b/tests/test_monitor.c @@ -15,7 +15,7 @@ static void printUsage() printf( " -h - Show this help\n" ); } -static void dump( XklConfigRecPtr ptr ) +void dump( XklConfigRecPtr ptr ) { int i,j; char**p; @@ -87,7 +87,6 @@ int main( int argc, char * argv[] ) while (1) { - int grp; XNextEvent( dpy, &ev.core ); if ( XklFilterEvents( &ev.core ) ) XklDebug( 200, "Unknown event %d\n", ev.type ); |