xorg-server-devel @1.20.3 does not build on Mac OS X 10.5.8, Leopard, because of redefinition of typedef ‘CARD32’

[ballapete (Peter "Pete" Dyballa)]

Similar to ticket #57333 I get:

libtool: compile:  /usr/bin/gcc-4.2 -std=gnu99 -DHAVE_CONFIG_H -I. -I../include -I../include -I/opt/local/include -I/usr/include -I/opt/local/var/macports/sources/nue.de.rsync.macports.org/macports/release/tarballs/ports/x11/xorg-server-devel/files/dri -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks -I/opt/local/var/macports/sources/nue.de.rsync.macports.org/macports/release/tarballs/ports/x11/xorg-server-devel/files/include -DHAVE_DIX_CONFIG_H -Wall -Wpointer-arith -Wmissing-declarations -Wformat=2 -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast -Wold-style-definition -Wdeclaration-after-statement -Wunused -Wuninitialized -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Werror=implicit -Werror=nonnull -Werror=init-self -Werror=main -Werror=missing-braces -Werror=sequence-point -Werror=return-type -Werror=trigraphs -Werror=write-strings -Werror=address -Werror=int-to-pointer-cast -Werror=pointer-to-int-cast -fno-strict-aliasing -fno-strict-aliasing -D_DEFAULT_SOURCE -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -I/opt/local/include/pixman-1 -I/opt/local/include/freetype2 -I/opt/local/include/libpng16 -I../include -I../include -I../Xext -I../damageext -I../xfixes -I../Xi -I../mi -I../miext/sync -I../miext/shadow -I../miext/damage -I../render -I../randr -I../fb -I../dbe -I../present -pipe -Os -arch ppc -D_THREAD_SAFE -pthread -DROOTLESS_WORKAROUND -DROOTLESS_SAFEALPHA -DNO_ALLOCA -MT pixmap.lo -MD -MP -MF .deps/pixmap.Tpo -c pixmap.c  -fno-common -DPIC -o .libs/pixmap.o
In file included from pixmap.c:45:
../randr/randrstr.h:66: error: redefinition of typedef ‘CARD32’
/opt/local/include/X11/Xmd.h:111: error: previous declaration of ‘CARD32’ was here
make[2]: *** [pixmap.lo] Error 1
make[2]: Leaving directory `/opt/local/var/macports/build/_opt_local_var_macports_sources_nue.de.rsync.macports.org_macports_release_tarballs_ports_x11_xorg-server-devel/xorg-server-devel/work/xorg-server-devel-1.20.3/dix'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/opt/local/var/macports/build/_opt_local_var_macports_sources_nue.de.rsync.macports.org_macports_release_tarballs_ports_x11_xorg-server-devel/xorg-server-devel/work/xorg-server-devel-1.20.3/dix'
make: *** [all-recursive] Error 1
make: Leaving directory `/opt/local/var/macports/build/_opt_local_var_macports_sources_nue.de.rsync.macports.org_macports_release_tarballs_ports_x11_xorg-server-devel/xorg-server-devel/work/xorg-server-devel-1.20.3'
Command failed:  cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_nue.de.rsync.macports.org_macports_release_tarballs_ports_x11_xorg-server-devel/xorg-server-devel/work/xorg-server-devel-1.20.3" && /usr/bin/make -w all V=1 
Exit code: 2

[ballapete (Peter "Pete" Dyballa)]

Main.log from PPC Leopard

[ballapete (Peter "Pete" Dyballa)]

The patch

--- hw/xquartz/xpr/x-list.h-orig	2019-01-31 17:19:02.000000000 +0100
+++ hw/xquartz/xpr/x-list.h	2019-01-31 17:21:20.000000000 +0100
@@ -47,6 +47,7 @@
 #ifndef X_EXTERN
 #define X_EXTERN __private_extern__
 #endif
+#define __private_extern__  __attribute__((visibility("hidden")))
 
 X_EXTERN void X_PFX(list_free_1) (x_list * node);
 X_EXTERN x_list *X_PFX(list_prepend) (x_list * lst, void *data);

as proposed in ticket #57333 does not remove compile error. At least not with GCC4.2. With this compiler only these C header files are used:

. ../include/dix-config.h
.. ../include/dix-config-apple-verbatim.h
. /opt/local/include/X11/X.h
. ../include/scrnintstr.h
.. ../include/screenint.h
... ../include/misc.h
.... /opt/local/include/X11/Xosdefs.h
.... /opt/local/include/X11/Xfuncproto.h
.... /opt/local/include/X11/Xmd.h
.... /opt/local/include/X11/Xdefs.h
.... /usr/lib/gcc/powerpc-apple-darwin9/4.2.1/include/stddef.h
.... /usr/lib/gcc/powerpc-apple-darwin9/4.2.1/include/stdint.h
.... /usr/include/pthread.h
..... /usr/include/_types.h
...... /usr/include/sys/_types.h
....... /usr/include/sys/cdefs.h
....... /usr/include/machine/_types.h
........ /usr/include/ppc/_types.h
..... /usr/include/pthread_impl.h
..... /usr/include/sched.h
..... /usr/include/time.h
...... /usr/include/_structs.h
....... /usr/include/sys/_structs.h
.... ../include/os.h
..... ../include/misc.h
..... /usr/lib/gcc/powerpc-apple-darwin9/4.2.1/include/stdarg.h
..... /usr/include/string.h
..... /usr/include/stdio.h
..... ../include/Xprintf.h
..... /usr/include/signal.h
...... /usr/include/sys/signal.h
....... /usr/include/sys/appleapiopts.h
....... /usr/include/machine/signal.h
........ /usr/include/ppc/signal.h
......... /usr/include/ppc/_structs.h
....... /usr/include/sys/_structs.h
........ /usr/include/machine/_structs.h
......... /usr/include/ppc/_structs.h
.......... /usr/include/mach/ppc/_structs.h
.... /opt/local/include/X11/Xfuncs.h
..... /usr/include/strings.h
.... /usr/include/stdlib.h
..... /usr/include/available.h
..... /usr/include/sys/wait.h
...... /usr/include/sys/resource.h
....... /usr/include/sys/_structs.h
...... /usr/include/machine/endian.h
....... /usr/include/ppc/endian.h
........ /usr/include/sys/_endian.h
..... /usr/include/alloca.h
..... /usr/include/machine/types.h
...... /usr/include/ppc/types.h
....... /usr/include/ppc/_types.h
.... /usr/lib/gcc/powerpc-apple-darwin9/4.2.1/include/limits.h
..... /usr/lib/gcc/powerpc-apple-darwin9/4.2.1/include/syslimits.h
..... /usr/include/limits.h
...... /usr/include/machine/limits.h
....... /usr/include/ppc/limits.h
........ /usr/include/ppc/_limits.h
...... /usr/include/sys/syslimits.h
.... /usr/include/math.h
..... /usr/include/architecture/ppc/math.h
.... /usr/include/assert.h
.... /usr/include/ctype.h
..... /usr/include/runetype.h
.. ../include/regionstr.h
... ../include/miscstruct.h
.... /opt/local/include/X11/Xprotostr.h
.... /opt/local/include/pixman-1/pixman.h
..... /opt/local/include/pixman-1/pixman-version.h
.. ../include/colormap.h
... /opt/local/include/X11/Xproto.h
... ../include/window.h
.... ../include/region.h
.. ../include/cursor.h
... ../include/privates.h
.... ../include/dix.h
..... ../include/callback.h
..... ../include/gc.h
...... ../include/pixmap.h
....... /opt/local/include/X11/extensions/randr.h
..... ../include/input.h
...... ../include/xkbrules.h
...... ../include/events.h
...... ../include/list.h
....... /usr/lib/gcc/powerpc-apple-darwin9/4.2.1/include/stddef.h
...... /opt/local/include/X11/extensions/XI2.h
..... ../include/cursor.h
..... ../Xext/geext.h
...... /opt/local/include/X11/extensions/geproto.h
....... /opt/local/include/X11/extensions/ge.h
..... /opt/local/include/X11/extensions/XI.h
.... ../include/resource.h
..... ../include/dixaccess.h
.. ../include/validate.h
. ../include/misc.h
. ../include/os.h
. ../include/windowstr.h
.. ../include/pixmapstr.h
... ../miext/damage/damage.h
... ../render/picturestr.h
.... ../include/scrnintstr.h
.... ../render/glyphstr.h
..... /opt/local/include/X11/extensions/renderproto.h
...... /opt/local/include/X11/extensions/render.h
..... ../render/picture.h
...... ../include/privates.h
..... ../include/screenint.h
..... ../include/regionstr.h
..... ../include/miscstruct.h
.... ../include/resource.h
.. ../include/property.h
.. ../include/opaque.h
... ../include/globals.h
.... ../include/extinit.h
..... ../include/extnsionst.h
...... ../include/extension.h
....... ../include/dixstruct.h
........ ../include/client.h
......... /usr/include/sys/types.h
.......... /usr/include/sys/_structs.h
..... ../present/presentext.h
. ../include/resource.h
. ../include/dixstruct.h
. ../include/gcstruct.h
. ../include/servermd.h
.. /opt/local/include/X11/Xarch.h
. ../include/site.h
. ../render/picturestr.h
. ../randr/randrstr.h
.. ../include/misc.h
.. ../include/os.h
.. ../include/dixstruct.h
.. ../include/resource.h
.. ../include/scrnintstr.h
.. ../include/windowstr.h
.. ../include/pixmapstr.h
.. ../include/extnsionst.h
.. ../include/servermd.h
.. ../randr/rrtransform.h
... ../render/picturestr.h
.. /opt/local/include/X11/extensions/randrproto.h

[kencu (Ken)]

Hi Pete -- let's follow this along on the other ticket. I have this fixed, just need to decide the most elegant way of doing it.

Duplicate of 57333

[ballapete (Peter "Pete" Dyballa)]

With my old patch set XQuartz 1.20.3 (xorg-server 1.20.3)built. And it also runs.