[uim commit] r5070 - trunk/uim

[codesite-noreply]

Author: ek.kato
Date: Sat Dec 29 07:55:41 2007
New Revision: 5070
Modified:
  trunk/uim/mana.c
  trunk/uim/plugin.c
  trunk/uim/skk.c
  trunk/uim/uim-helper-server.c
  trunk/uim/uim-helper.c
  trunk/uim/uim-notify.c

Log:
* mana.c
* plugin.c
* uim-helper.c
* uim-helper-server.c
* skk.c
 - Include uim-notify.h.
* uim-notify.c
 - Suppress compilation warnings.


Modified: trunk/uim/mana.c
==============================================================================
--- trunk/uim/mana.c    (original)
+++ trunk/uim/mana.c    Sat Dec 29 07:55:41 2007
@@ -51,6 +51,7 @@
#include "uim-scm-abbrev.h"
#include "uim-util.h"
#include "plugin.h"
+#include "uim-notify.h"

#define MANA_COMMAND "mana"


Modified: trunk/uim/plugin.c
==============================================================================
--- trunk/uim/plugin.c  (original)
+++ trunk/uim/plugin.c  Sat Dec 29 07:55:41 2007
@@ -52,6 +52,7 @@
#include "uim-scm-abbrev.h"
#include "plugin.h"
#include "uim-internal.h"
+#include "uim-notify.h"

#ifndef HAVE_DLFUNC
#define dlfunc dlsym

Modified: trunk/uim/skk.c
==============================================================================
--- trunk/uim/skk.c     (original)
+++ trunk/uim/skk.c     Sat Dec 29 07:55:41 2007
@@ -62,6 +62,7 @@
#include "uim-scm-abbrev.h"
#include "uim-helper.h"
#include "plugin.h"
+#include "uim-notify.h"

#include "bsdlook.h"


Modified: trunk/uim/uim-helper-server.c
==============================================================================
--- trunk/uim/uim-helper-server.c       (original)
+++ trunk/uim/uim-helper-server.c       Sat Dec 29 07:55:41 2007
@@ -54,6 +54,7 @@
#include "uim.h"
#include "uim-internal.h"
#include "uim-helper.h"
+#include "uim-notify.h"


struct client {

Modified: trunk/uim/uim-helper.c
==============================================================================
--- trunk/uim/uim-helper.c      (original)
+++ trunk/uim/uim-helper.c      Sat Dec 29 07:55:41 2007
@@ -51,6 +51,7 @@
#include "uim-internal.h"
#include "uim-helper.h"
#include "uim-util.h"
+#include "uim-notify.h"

#ifndef HAVE_SIG_T
typedef void (*sig_t)(int);

Modified: trunk/uim/uim-notify.c
==============================================================================
--- trunk/uim/uim-notify.c      (original)
+++ trunk/uim/uim-notify.c      Sat Dec 29 07:55:41 2007
@@ -98,22 +98,22 @@
      fprintf(stderr, "uim-notify: load failed %s(%s)\n", path, str);
      return 0;
    }
-    uim_notify_init_func  = dlfunc(handle, "uim_notify_init");
+    uim_notify_init_func  = (int (*)(void))(intptr_t)dlfunc(handle, 
"uim_notify_init");
    if (!uim_notify_init_func) {
       fprintf(stderr, "uim-notify: cannot found 'uim_notify_init()' 
in %s\n", path);
      return 0;
    }
-    uim_notify_quit_func  = dlfunc(handle, "uim_notify_quit");
+    uim_notify_quit_func  = (void (*)(void))(intptr_t)dlfunc(handle, 
"uim_notify_quit");
    if (!uim_notify_quit_func) {
       fprintf(stderr, "uim-notify: cannot found 'uim_notify_quit()' 
in %s\n", path);
      return 0;
    }
-    uim_notify_info_func  = dlfunc(handle, "uim_notify_info");
+    uim_notify_info_func  = (int (*)(const char *, va_list))(intptr_t)dlfunc(handle, 
"uim_notify_info");
    if (!uim_notify_info_func) {
       fprintf(stderr, "uim-notify: cannot found 'uim_notify_info()' 
in %s\n", path);
      return 0;
    }
-    uim_notify_fatal_func = dlfunc(handle, "uim_notify_fatal");
+    uim_notify_fatal_func = (int (*)(const char *, va_list))(intptr_t)dlfunc(handle, 
"uim_notify_fatal");
    if (!uim_notify_fatal_func) {
       fprintf(stderr, "uim-notify: cannot found 'uim_notify_fatal()' 
in %s\n", path);
      return 0;