[uim-commit] r613 - in trunk: . xim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-02-08 07:10:46 -0800 (Tue, 08 Feb 2005)
New Revision: 613

Modified:
   trunk/configure.ac
   trunk/xim/convdisp.cpp
   trunk/xim/util.h
   trunk/xim/ximpacket.cpp
   trunk/xim/ximserver.cpp
Log:
* configure.ac : Remove -Wmissing-format-attribute from CXXFLAGS
  to prevent compilation error with gcc-2.95.3.  Thanks KIHARA
  Hideto.
* xim/util.h : Include <stdarg.h> for va_list.
* xim/ximserver.cpp : Include "config.h"
* xim/convdisp.cpp : Ditto.
* xim/ximpacket.cpp (RxPacket_impl::RxPacket_impl): Fix compilation 
  warning of copy constructor.


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-02-08 13:43:36 UTC (rev 612)
+++ trunk/configure.ac	2005-02-08 15:10:46 UTC (rev 613)
@@ -647,7 +647,7 @@
 # add warning flags to CFLAGS if GCC=yes
 if test x$CC = xgcc; then
 	CFLAGS="$CFLAGS -Wall -std=gnu89 -pedantic -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare"
-	CXXFLAGS="$CXXFLAGS -Wnon-virtual-dtor -Wno-long-long -ansi -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute"
+	CXXFLAGS="$CXXFLAGS -Wnon-virtual-dtor -Wno-long-long -ansi -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security"
 fi
 
 if test x$enable_compat_scm = xyes; then

Modified: trunk/xim/convdisp.cpp
===================================================================
--- trunk/xim/convdisp.cpp	2005-02-08 13:43:36 UTC (rev 612)
+++ trunk/xim/convdisp.cpp	2005-02-08 15:10:46 UTC (rev 613)
@@ -32,6 +32,10 @@
 
 // classes for preedit draw
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/shape.h>

Modified: trunk/xim/util.h
===================================================================
--- trunk/xim/util.h	2005-02-08 13:43:36 UTC (rev 612)
+++ trunk/xim/util.h	2005-02-08 15:10:46 UTC (rev 613)
@@ -51,6 +51,7 @@
 #endif
 
 #ifndef HAVE_VASPRINTF
+#include <stdarg.h>
 int vasprintf(char **ptr, const char *fmt, va_list ap);
 #endif
 

Modified: trunk/xim/ximpacket.cpp
===================================================================
--- trunk/xim/ximpacket.cpp	2005-02-08 13:43:36 UTC (rev 612)
+++ trunk/xim/ximpacket.cpp	2005-02-08 15:10:46 UTC (rev 613)
@@ -410,7 +410,7 @@
     rewind();
 }
 
-RxPacket_impl::RxPacket_impl(const RxPacket_impl& rhs)
+RxPacket_impl::RxPacket_impl(const RxPacket_impl& rhs) : RxPacket(rhs)
 {
     mLen = rhs.mLen;
     mBuf = (unsigned char *)malloc(mLen);

Modified: trunk/xim/ximserver.cpp
===================================================================
--- trunk/xim/ximserver.cpp	2005-02-08 13:43:36 UTC (rev 612)
+++ trunk/xim/ximserver.cpp	2005-02-08 15:10:46 UTC (rev 613)
@@ -30,6 +30,10 @@
   SUCH DAMAGE.
 */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdio.h>
 #include <ctype.h>
 #include <locale.h>