[uim-commit] r646 - trunk/xim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-02-13 23:54:41 -0800 (Sun, 13 Feb 2005)
New Revision: 646

Modified:
   trunk/xim/connection.cpp
   trunk/xim/helper.cpp
   trunk/xim/locale.cpp
   trunk/xim/main.cpp
   trunk/xim/ximic.cpp
   trunk/xim/ximim.cpp
   trunk/xim/ximserver.cpp
   trunk/xim/ximtrans.cpp
Log:
* Fix compilation on Solaris9.
* xim/connection.cpp : Include "config.h" and "alloca.h"
  appropriately.
* xim/ximtrans.cpp : Include "alloca.h" appropriately.
* xim/ximic.cpp : Ditto.
* xim/ximim.cpp : Ditto.
* xim/ximserver.cpp : Check definition of _GNU_SOURCE.
* xim/main.cpp Ditto.
* xim/helper.cpp : Ditto.
* xim/locale.cpp : Ditto.


Modified: trunk/xim/connection.cpp
===================================================================
--- trunk/xim/connection.cpp	2005-02-14 07:17:58 UTC (rev 645)
+++ trunk/xim/connection.cpp	2005-02-14 07:54:41 UTC (rev 646)
@@ -32,6 +32,10 @@
 
 // connection management
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,10 +43,8 @@
 #include <list>
 #include <map>
 #include <X11/Xatom.h>
-#ifndef __GNUC__
-# ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-# endif
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
 #endif
 
 #define BUF_SIZE 1024

Modified: trunk/xim/helper.cpp
===================================================================
--- trunk/xim/helper.cpp	2005-02-14 07:17:58 UTC (rev 645)
+++ trunk/xim/helper.cpp	2005-02-14 07:54:41 UTC (rev 646)
@@ -36,7 +36,9 @@
 # include "config.h"
 #endif
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>

Modified: trunk/xim/locale.cpp
===================================================================
--- trunk/xim/locale.cpp	2005-02-14 07:17:58 UTC (rev 645)
+++ trunk/xim/locale.cpp	2005-02-14 07:54:41 UTC (rev 646)
@@ -36,7 +36,9 @@
 # include "config.h"
 #endif
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #include <stdio.h>
 #include <locale.h>
 #include <iconv.h>

Modified: trunk/xim/main.cpp
===================================================================
--- trunk/xim/main.cpp	2005-02-14 07:17:58 UTC (rev 645)
+++ trunk/xim/main.cpp	2005-02-14 07:54:41 UTC (rev 646)
@@ -37,7 +37,9 @@
 # include "config.h"
 #endif
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <locale.h>

Modified: trunk/xim/ximic.cpp
===================================================================
--- trunk/xim/ximic.cpp	2005-02-14 07:17:58 UTC (rev 645)
+++ trunk/xim/ximic.cpp	2005-02-14 07:54:41 UTC (rev 646)
@@ -48,10 +48,8 @@
 #include "connection.h"
 #include "util.h"
  
-#ifndef __GNUC__
-# ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-# endif
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
 #endif
 
 char invalid_style_msg[]=

Modified: trunk/xim/ximim.cpp
===================================================================
--- trunk/xim/ximim.cpp	2005-02-14 07:17:58 UTC (rev 645)
+++ trunk/xim/ximim.cpp	2005-02-14 07:54:41 UTC (rev 646)
@@ -45,10 +45,8 @@
 #define NEED_EVENTS	// for declaration of xEvent
 #include <X11/Xproto.h>
 
-#ifndef __GNUC__
-# ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-# endif
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
 #endif
 
 static std::map<int, XimIM *> g_ims;

Modified: trunk/xim/ximserver.cpp
===================================================================
--- trunk/xim/ximserver.cpp	2005-02-14 07:17:58 UTC (rev 645)
+++ trunk/xim/ximserver.cpp	2005-02-14 07:54:41 UTC (rev 646)
@@ -34,7 +34,9 @@
 # include "config.h"
 #endif
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE 
+#endif
 #include <stdio.h>
 #include <ctype.h>
 #include <locale.h>

Modified: trunk/xim/ximtrans.cpp
===================================================================
--- trunk/xim/ximtrans.cpp	2005-02-14 07:17:58 UTC (rev 645)
+++ trunk/xim/ximtrans.cpp	2005-02-14 07:54:41 UTC (rev 646)
@@ -42,10 +42,8 @@
 #include "xim.h"
 #include "util.h"
 
-#ifndef __GNUC__
-# ifdef HAVE_ALLOCA_H
-#  include <alloca.h>
-# endif
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
 #endif
 
 const char *xim_packet_name[] = {