Attachment 19439 Details for Bug 17946 – patch to avoid gcc warning for libX11 (V 1.1.5): redefined

[patch] patch to avoid gcc warning for libX11 (V 1.1.5): redefined

patch-01-libX11-define-as-one (text/plain), 1.80 KB, created by Peter Breitenlohner on 2008-10-07 08:27:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Breitenlohner

Created: 2008-10-07 08:27:12 UTC

Size: 1.80 KB

patch

obsolete

>	Define as 1 (one) as done by autoconf and the command line
>	option, e.g. -DX11_t, not as empty.
>
>	This avoids the gcc (3.4.6) warnings:
>		../../libX11-1.1.5/src/x11_trans.c:27:1: warning: "X11_t" redefined
>		<command line>:7:1: warning: this is the location of the previous definition
>		../../libX11-1.1.5/src/x11_trans.c:28:1: warning: "TRANS_CLIENT" redefined
>		<command line>:8:1: warning: this is the location of the previous definition
>
>	Similarly, follow the autoconf convention to define XTHREADS
>	and XUSE_MTSAFE_API as one.
>
>	This avoids analogous warnings when compiling libXcomposite,
>	libXcursor, and libXdamage.
>
>	No reason to AC_SUBST XTHREADS and XUSE_MTSAFE_API (unused).
>
>diff -ur libX11-1.1.5.orig/configure.ac libX11-1.1.5/configure.ac
>--- libX11-1.1.5.orig/configure.ac	2008-09-04 23:38:59.000000000 +0200
>+++ libX11-1.1.5/configure.ac	2008-10-07 14:35:37.000000000 +0200
>@@ -168,17 +168,15 @@
> 
> case x$xthreads in
> xyes)
>-	AC_DEFINE(XTHREADS,[],[Whether libX11 is compiled with thread support])
>+	AC_DEFINE(XTHREADS,1,[Whether libX11 is compiled with thread support])
> 	if test x$mtsafeapi = xyes
> 	then
>-	AC_DEFINE(XUSE_MTSAFE_API,[],[Whether libX11 needs to use MT safe API's])
>+	AC_DEFINE(XUSE_MTSAFE_API,1,[Whether libX11 needs to use MT safe API's])
> 	fi
> 	;;
> *)
> 	;;
> esac
>-AC_SUBST(XTHREADS)
>-AC_SUBST(XUSE_MTSAFE_API)
> 
> AC_CHECK_LIB(c, pthread_self, [thrstubs="no"], [thrstubs="yes"])
> AM_CONDITIONAL(THRSTUBS, test x$thrstubs = xyes)
>diff -ur libX11-1.1.5.orig/src/x11_trans.c libX11-1.1.5/src/x11_trans.c
>--- libX11-1.1.5.orig/src/x11_trans.c	2008-09-04 23:35:13.000000000 +0200
>+++ libX11-1.1.5/src/x11_trans.c	2008-10-07 14:35:37.000000000 +0200
>@@ -24,7 +24,7 @@
> #include "config.h"
> #endif
> 
>-#define X11_t
>-#define TRANS_CLIENT
>+#define X11_t 1
>+#define TRANS_CLIENT 1
> #include <X11/Xtrans/transport.c>
>

Actions: View | Splinter Review

Attachments on bug 17946: 19439 | 19440 | 19441 | 19442 | 19443

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.