[uim-commit] r846 - in trunk: fep xim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-05-25 03:20:31 -0700 (Wed, 25 May 2005)
New Revision: 846

Modified:
   trunk/fep/escseq.c
   trunk/fep/key.c
   trunk/fep/uim-fep.c
   trunk/xim/compose.cpp
Log:
* fep/uim-fep.c : Avoid conflict of including term.h and
  ncurses.term.h.
* fep/escseq.c : Ditto.
* fep/key.c : Ditto.

* xim/compose.cpp (XimIM::get_mb_string) : Remove unused variable.


Modified: trunk/fep/escseq.c
===================================================================
--- trunk/fep/escseq.c	2005-05-24 08:03:21 UTC (rev 845)
+++ trunk/fep/escseq.c	2005-05-25 10:20:31 UTC (rev 846)
@@ -41,11 +41,10 @@
 #ifdef HAVE_CURSES_H
 #include <curses.h>
 #endif
-#ifdef HAVE_NCURSES_TERM_H
-#include <ncurses/term.h>
-#endif
 #ifdef HAVE_TERM_H
 #include <term.h>
+#elif HAVE_NCURSES_TERM_H
+#include <ncurses/term.h>
 #endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

Modified: trunk/fep/key.c
===================================================================
--- trunk/fep/key.c	2005-05-24 08:03:21 UTC (rev 845)
+++ trunk/fep/key.c	2005-05-25 10:20:31 UTC (rev 846)
@@ -43,11 +43,10 @@
 #ifdef HAVE_CURSES_H
 #include <curses.h>
 #endif
-#ifdef HAVE_NCURSES_TERM_H
-#include <ncurses/term.h>
-#endif
 #ifdef HAVE_TERM_H
 #include <term.h>
+#elif HAVE_NCURSES_TERM_H
+#include <ncurses/term.h>
 #endif
 #ifdef HAVE_STRING_H
 #include <string.h>

Modified: trunk/fep/uim-fep.c
===================================================================
--- trunk/fep/uim-fep.c	2005-05-24 08:03:21 UTC (rev 845)
+++ trunk/fep/uim-fep.c	2005-05-25 10:20:31 UTC (rev 846)
@@ -63,11 +63,10 @@
 #ifdef HAVE_CURSES_H
 #include <curses.h>
 #endif
-#ifdef HAVE_NCURSES_TERM_H
-#include <ncurses/term.h>
-#endif
 #ifdef HAVE_TERM_H
 #include <term.h>
+#elif HAVE_NCURSES_TERM_H
+#include <ncurses/term.h>
 #endif
 #ifdef HAVE_STDARG_H
 #include <stdarg.h>

Modified: trunk/xim/compose.cpp
===================================================================
--- trunk/xim/compose.cpp	2005-05-24 08:03:21 UTC (rev 845)
+++ trunk/xim/compose.cpp	2005-05-25 10:20:31 UTC (rev 846)
@@ -411,7 +411,6 @@
 XimIM::get_mb_string(char *buf, KeySym ks)
 {
     int len;
-    const char *encoding = get_encoding();
     char local_buf[MB_LEN_MAX];
     char *mb;
     unsigned int ucs;