tags 320899 patch thanks Hi Roger,
Please find attached a pair of patches that fix the gcc 4.0 compatibility issues in im-sdk. Cheers, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/
diff -Nru3 ./im-sdk-r11_4-1870/leif/unit/phonetic_im/mapfile/Makefile.am
../build-tree.new/im-sdk-r11_4-1870/leif/unit/phonetic_im/mapfile/Makefile.am
--- ./im-sdk-r11_4-1870/leif/unit/phonetic_im/mapfile/Makefile.am
2004-08-16 05:40:06.000000000 -0700
+++
../build-tree.new/im-sdk-r11_4-1870/leif/unit/phonetic_im/mapfile/Makefile.am
2005-09-01 02:31:25.496312826 -0700
@@ -34,6 +34,9 @@
-e "s/parse_small_token/parse_$*/g" \
-e "s/^void yyunput/static void yyunput/g" \
-e "s/^int yylen/static int yylen/g" \
+ -e "/^extern int yylen/d" \
+ -e "/^#undef YY_INPUT/i \
+ static int loc_input (char *buf, int ms);" \
-e "s/^YY_BUFFER_STATE yy_create_buffer/static YY_BUFFER_STATE
yy_create_buffer/g" \
-e "s/^void yy_load_buffer_state/static void yy_load_buffer_state/g" \
-e "s/^void yyrestart/static void yyrestart/g" \
@@ -57,23 +60,25 @@
-e "s/^int yyprevious/static int yyprevious/g" \
-e "s/^char \*yysptr/static char \*yysptr/g" \
-e "s/^int yylineno/static int yylineno/g" \
+ -e "/^extern int yylineno/d" \
-e "s/^char yyextra/static char yyextra/g" \
-e "s/^char yymatch/static char yymatch/g" \
-e "s/^struct yywork \*yytop/static struct yywork \*yytop/g" \
-e "s/^struct yywork { YYTYPE verify, advance; } yycrank/static struct
yywork { YYTYPE verify, advance; } yycrank/g" \
-e "s/^FILE \*yyin/static FILE \*yyin/g" \
+ -e "/^extern FILE \*yyin/d" \
-e "s/^struct yysvf \*yybgin/static struct yysvf \*yybgin/g" \
-e "s/^int yyvstop/static int yyvstop/g" \
-e "s/^int yylook/static int yylook/g" \
-e "s/^struct yysvf yysvec/static struct yysvf yysvec/g" \
-e "s/^int yylex/static int yylex/g" \
- -e "s/^yylex/static int yylex/g" \
+ -e "s/^extern int yywrap/static int yywrap/g" \
+ -e "/^extern int yylex/d" \
-e "s/^#define YY_DECL int yylex/#define YY_DECL static int yylex/g" \
-e "s/^# define input().*/# define input() (\*global_ptr++)/g" \
-e "s/^static int input().*/static int redef_input()/g" \
-e "s/^# define unput(c).*/# define unput(c) (\*--global_ptr=c)/g" \
-e "s/^#define unput(c).*/#define unput(c) (\*--global_ptr=c)/g" \
- -e "/^#line/d" \
-e "/^static char \*global_ptr\;/i\
#define YY_NO_INPUT" -e "/^static char \*global_ptr\;/i\
#define YY_NO_UNPUT" -e "/^static char \*global_ptr\;/i\
diff -Nru3 ./im-sdk-r11_4-1870/leif/unit/phonetic_im/mapfile/Makefile.in
../build-tree.new/im-sdk-r11_4-1870/leif/unit/phonetic_im/mapfile/Makefile.in
--- ./im-sdk-r11_4-1870/leif/unit/phonetic_im/mapfile/Makefile.in
2004-08-16 06:28:05.000000000 -0700
+++
../build-tree.new/im-sdk-r11_4-1870/leif/unit/phonetic_im/mapfile/Makefile.in
2005-09-01 02:31:33.000000000 -0700
@@ -593,6 +593,9 @@
-e "s/parse_small_token/parse_$*/g" \
-e "s/^void yyunput/static void yyunput/g" \
-e "s/^int yylen/static int yylen/g" \
+ -e "/^extern int yylen/d" \
+ -e "/^#undef YY_INPUT/i \
+ static int loc_input (char *buf, int ms);" \
-e "s/^YY_BUFFER_STATE yy_create_buffer/static YY_BUFFER_STATE
yy_create_buffer/g" \
-e "s/^void yy_load_buffer_state/static void yy_load_buffer_state/g" \
-e "s/^void yyrestart/static void yyrestart/g" \
@@ -616,23 +619,25 @@
-e "s/^int yyprevious/static int yyprevious/g" \
-e "s/^char \*yysptr/static char \*yysptr/g" \
-e "s/^int yylineno/static int yylineno/g" \
+ -e "/^extern int yylineno/d" \
-e "s/^char yyextra/static char yyextra/g" \
-e "s/^char yymatch/static char yymatch/g" \
-e "s/^struct yywork \*yytop/static struct yywork \*yytop/g" \
-e "s/^struct yywork { YYTYPE verify, advance; } yycrank/static struct
yywork { YYTYPE verify, advance; } yycrank/g" \
-e "s/^FILE \*yyin/static FILE \*yyin/g" \
+ -e "/^extern FILE \*yyin/d" \
-e "s/^struct yysvf \*yybgin/static struct yysvf \*yybgin/g" \
-e "s/^int yyvstop/static int yyvstop/g" \
-e "s/^int yylook/static int yylook/g" \
-e "s/^struct yysvf yysvec/static struct yysvf yysvec/g" \
-e "s/^int yylex/static int yylex/g" \
- -e "s/^yylex/static int yylex/g" \
+ -e "s/^extern int yywrap/static int yywrap/g" \
+ -e "/^extern int yylex/d" \
-e "s/^#define YY_DECL int yylex/#define YY_DECL static int yylex/g" \
-e "s/^# define input().*/# define input() (\*global_ptr++)/g" \
-e "s/^static int input().*/static int redef_input()/g" \
-e "s/^# define unput(c).*/# define unput(c) (\*--global_ptr=c)/g" \
-e "s/^#define unput(c).*/#define unput(c) (\*--global_ptr=c)/g" \
- -e "/^#line/d" \
-e "/^static char \*global_ptr\;/i\
#define YY_NO_INPUT" -e "/^static char \*global_ptr\;/i\
#define YY_NO_UNPUT" -e "/^static char \*global_ptr\;/i\
diff -Nru3 ./im-sdk-r11_4-1870/leif/canna/CannaLE.c
../build-tree.new/im-sdk-r11_4-1870/leif/canna/CannaLE.c
--- ./im-sdk-r11_4-1870/leif/canna/CannaLE.c 2004-08-16 00:31:54.000000000
-0700
+++ ../build-tree.new/im-sdk-r11_4-1870/leif/canna/CannaLE.c 2005-09-01
03:27:42.798116123 -0700
@@ -118,6 +118,7 @@
void canna_status_draw_off(iml_session_t *s);
static void canna_change_mode(iml_session_t *s, int id);
static Bool canna_drop_privilege(const char *username);
+static int canna_get_current_mode(iml_session_t *s);
/* IF Method */
if_methods_t canna_methods = {
--- ./im-sdk-r11_4-1870/leif/sampleja3/xaux_common/xaux_ext_common.h
2005-09-01 03:59:51.297887161 -0700
+++
../build-tree.new/im-sdk-r11_4-1870/leif/sampleja3/xaux_common/xaux_ext_common.h
2005-09-01 04:00:13.464928210 -0700
@@ -80,10 +80,6 @@
extern Bool xaux_ext_Draw(xaux_class_t *, aux_ext_data_t *);
extern Bool xaux_ext_Done(xaux_class_t *, aux_ext_data_t *);
-/* conversion utilities */
-extern size_t utf16_mb(const char **, size_t *, char **, size_t *);
-extern size_t mb_utf16(const char **, size_t *, char **, size_t *);
-
#ifndef linux
#include <Xm/Xm.h>
#endif
--- ./im-sdk-r11_4-1870/leif/sampleja3/xaux_common/xaux_ext_common.c
2004-08-16 00:31:54.000000000 -0700
+++
../build-tree.new/im-sdk-r11_4-1870/leif/sampleja3/xaux_common/xaux_ext_common.c
2005-09-01 04:01:15.176262833 -0700
@@ -55,6 +55,16 @@
#include "xaux_common.h"
#include "xaux_ext_common.h"
+static Bool
+xaux_xs_send_message(
+ Display * display,
+ xaux_class_t * xc,
+ int im_id,
+ int ic_id,
+ aux_ext_data_type_t type,
+ Atom atom);
+
+
/* from iiimpAux.c */
static size_t
utf16_mb(
signature.asc
Description: Digital signature
