[uim-commit] r828 - in trunk: uim xim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-04-24 22:55:24 -0700 (Sun, 24 Apr 2005)
New Revision: 828

Modified:
   trunk/uim/uim-func.c
   trunk/uim/uim-util.h
   trunk/uim/uim.h
   trunk/xim/compose.cpp
   trunk/xim/locale.cpp
Log:
* uim/uim.h : Move prototype of uim_iconv_open to uim-util.h
* uim/uim-util.h : uim_iconv_open() moved from uim.h.
* uim/uim-func.c : Include uim-util.h for uim_iconv_open().
* xim/compose.cpp : Ditto.	
* xim/locale.cpp : Ditto.


Modified: trunk/uim/uim-func.c
===================================================================
--- trunk/uim/uim-func.c	2005-04-23 04:52:35 UTC (rev 827)
+++ trunk/uim/uim-func.c	2005-04-25 05:55:24 UTC (rev 828)
@@ -39,6 +39,7 @@
 #include "context.h"
 #include "uim-scm.h"
 #include "uim-encoding.h"
+#include "uim-util.h"
 
 #define MAX_LENGTH_OF_INT_AS_STR (((sizeof(int) == 4) ? sizeof("-2147483648") : sizeof("-9223372036854775808")) - sizeof((char)'\0'))
 

Modified: trunk/uim/uim-util.h
===================================================================
--- trunk/uim/uim-util.h	2005-04-23 04:52:35 UTC (rev 827)
+++ trunk/uim/uim-util.h	2005-04-25 05:55:24 UTC (rev 828)
@@ -55,6 +55,9 @@
 int
 is_setugid(void);
 
+/* uim's iconv_open wrapper */
+void *uim_iconv_open(const char *tocode, const char *fromcode);
+
 #ifdef __cplusplus
 }
 #endif

Modified: trunk/uim/uim.h
===================================================================
--- trunk/uim/uim.h	2005-04-23 04:52:35 UTC (rev 827)
+++ trunk/uim/uim.h	2005-04-25 05:55:24 UTC (rev 828)
@@ -581,9 +581,6 @@
 /* an uim_code_converter implementation using iconv */
 extern struct uim_code_converter *uim_iconv;
 
-/* uim's iconv_open wrapper */
-void *uim_iconv_open(const char *tocode, const char *fromcode);
-
 #ifdef __cplusplus
 }
 #endif

Modified: trunk/xim/compose.cpp
===================================================================
--- trunk/xim/compose.cpp	2005-04-23 04:52:35 UTC (rev 827)
+++ trunk/xim/compose.cpp	2005-04-25 05:55:24 UTC (rev 828)
@@ -47,6 +47,7 @@
 #include "xim.h"
 #include "ximserver.h"
 #include "compose.h"
+#include "uim/uim-util.h"
 
 #define COMPOSE_FILE	"Compose"
 #define COMPOSE_DIR_FILE	"X11/locale/compose.dir"

Modified: trunk/xim/locale.cpp
===================================================================
--- trunk/xim/locale.cpp	2005-04-23 04:52:35 UTC (rev 827)
+++ trunk/xim/locale.cpp	2005-04-25 05:55:24 UTC (rev 828)
@@ -47,6 +47,7 @@
 #include <X11/Xutil.h>
 #include "ximserver.h"
 #include "util.h"
+#include "uim/uim-util.h"
 #ifndef __GNUC__
 # ifdef HAVE_ALLOCA_H
 #  include <alloca.h>