Patch to fix some build errors/warnings

[Stefan Dirsch]

On Tue, Jun 21, 2005 at 12:35:24PM +0200, Stefan Dirsch wrote:
> On Tue, Jun 14, 2005 at 09:56:05AM -0700, Alan Coopersmith wrote:
> > Daniel Stone wrote:
> > >Hi Stefan,
> > >Some comments on a couple of fixes.
> > >
> > >On Tue, Jun 14, 2005 at 03:22:21PM +0200, Stefan Dirsch wrote:
> > >
> > >>lib/X11/src/imTrans.c
> > >>* imTrans.c:67: warning: implicit declaration of function 
> > >>'_XimXTransOpenCOTSClient'
> > >>* imTrans.c:67: warning: nested extern declaration of 
> > >>'_XimXTransOpenCOTSClient'
> > >>* imTrans.c:68: warning: assignment makes pointer from integer without a 
> > >>cast
> > >
> > >
> > >These sorts of errors should be correct by ensuring the declaration gets
> > >seen by all its users,  This should be fixable by defining TRANS_CLIENT?
> > 
> > And probably XIM_t as well.
> 
> Only for some special targets
> 
> - ximtrans 
> - imTransR
> - imTrans
> - libximcp (which is not autotooled yet)
> 
> since it will conflict with X11_t otherwise. I'll provide a patch
> ASAP.

See attached the patch. Since I don't know how to specify to use
special CFLAGS with autotool for some source files I patched these
directly (imTrans.c, xim_trans.c).

Stefan

Public Key available
------------------------------------------------------
Stefan Dirsch (Res. & Dev.)   SUSE LINUX Products GmbH
Tel: 0911-740 53 0            Maxfeldstraße 5
FAX: 0911-740 53 479          D-90409 Nürnberg
http://www.suse.de            Germany 
------------------------------------------------------
-------------- next part --------------
--- /usr/local/src/xorg/xorg-modular/lib/X11/src/Makefile.am	2005-06-15 15:40:27.000000000 +0200
+++ lib/X11/src/Makefile.am	2005-06-21 14:42:14.000000000 +0200
@@ -14,7 +14,7 @@
 		 $(BIGREQS_CFLAGS) \
 		 $(XDMCP_CFLAGS) \
 		 -DX11_DATADIR='"@X11_DATADIR@"' \
-                 -D_BSD_SOURCE
+                 -D_BSD_SOURCE -DX11_t -DTRANS_CLIENT
 
 libX11_la_LDFLAGS = -version-number 6:2:1 -no-undefined
 
--- /usr/local/src/xorg/xorg-modular/lib/FS/src/Makefile.am	2005-05-26 00:12:21.000000000 +0200
+++ lib/FS/src/Makefile.am	2005-06-21 14:42:46.000000000 +0200
@@ -1,5 +1,7 @@
 lib_LTLIBRARIES = libFS.la
 
+AM_CFLAGS= -DFS_t -DTRANS_CLIENT
+
 libFS_la_SOURCES = 	\
 	FSCloseFt.c	\
 	FSClServ.c	\
@@ -29,7 +31,7 @@
 	FSSynchro.c	\
 	fs_transport.c
 
-libFS_la_CFLAGS = $(DEP_CFLAGS)
+libFS_la_CFLAGS = $(DEP_CFLAGS) $(AM_CFLAGS)
 libFS_la_LIBADD = $(DEP_LIBS)
 
 INCLUDES = -I$(top_srcdir)/include/X11/fonts
--- /usr/local/src/xorg/xorg-modular/lib/ICE/src/Makefile.am	2005-05-17 23:25:15.000000000 +0200
+++ lib/ICE/src/Makefile.am	2005-06-21 12:47:28.000000000 +0200
@@ -1,6 +1,7 @@
 lib_LTLIBRARIES=libICE.la
 
-AM_CFLAGS= -I${top_srcdir}/include $(ICE_CFLAGS) $(XTRANS_CFLAGS)
+AM_CFLAGS= -I${top_srcdir}/include $(ICE_CFLAGS) $(XTRANS_CFLAGS) \
+           -DICE_t -DTRANS_CLIENT -DTRANS_SERVER
 
 libICE_la_LDFLAGS = -version-number 6:4:1 -no-undefined
 
--- /usr/local/src/xorg/xorg-modular/lib/X11/src/xim_trans.c	2005-06-09 17:55:34.000000000 +0200
+++ lib/X11/src/xim_trans.c	2005-06-21 14:46:23.000000000 +0200
@@ -22,6 +22,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#undef X11_t
 #define XIM_t
 #define TRANS_CLIENT
 
--- lib/X11/src/imTrans.c.orig	2005-06-21 13:23:25.000000000 +0000
+++ lib/X11/src/imTrans.c	2005-06-21 13:24:28.000000000 +0000
@@ -38,6 +38,8 @@
 #include <X11/Xmd.h>
 #define NEED_EVENTS
 #include "Xlibint.h"
+#undef X11_t
+#define XIM_t
 #include <X11/Xtrans/Xtrans.h>
 #include "Xlcint.h"
 #include "Ximint.h"