these compile errors are on amd athlon 3000+ (32bit)
a second computer running amd turion64 (64bit) had not errors using the same code

compiles were done under Gentoo linux.

After exporting the changes from that commit and using diff / patch to revert those changes from my build directory, I was able to successfully compile xorg-server.



(In reply to comment #0)
> The basic error is:
> 
> error: macro "Xcalloc" requires 2 arguments, but only 1 given
> In function 'kbdLinuxCreatePrivate':
> warning: initialization from incompatible pointer type
> 
> 
> This can be traced back to the following git commit:
>   id - 8a5b89e8e184f4cbf33c6dee0b06e61d8f857576
>   summary - xalloc+memset(0) -> xcalloc
> 
>   author        Adam Jackson <ajax@redhat.com>  2008-10-06 19:36:51
>   committer     Adam Jackson <ajax@redhat.com>  2008-10-06 19:36:51
>   tree  b042833775d237a3971eae7a7192400e064ad50d
>   parent        0b7b89fbac0b3865b2cf51295c68a5f4c7523f28 (diff)
> 
> 
> I'm using gcc version 4.1.2 and posix thread model.
> 

The following files still fail to compile:



error: macro "Xcalloc" requires 2 arguments, but only 1 given


hw/dmx/input/dmxmotion.c
hw/dmx/glxProxy/glxutil.c
hw/dmx/dmx.h
hw/dmx/dmxextension.c

grep can't find any Xcalloc in those files anymore.

(In reply to comment #4)
> grep can't find any Xcalloc in those files anymore.
> 

I just re-pulled xorg-server from git and there are still Xcalloc errors found.  Please re-check:

i686-pc-linux-gnu-gcc -DHAVE_CONFIG_H -I. -I../../../include    -DHAVE_DIX_CONFIG_H -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -I/usr/include/freetype2 -I/usr/include/pixman-1    -I../../../include -I../../../include -I../../../Xext -I../../../composite -I../../../damageext -I../../../xfixes -I../../../Xi -I../../../mi -I../../../miext/shadow  -I../../../miext/damage -I../../../render -I../../../randr -I../../../fb -I../../../hw/dmx -I/include -DHAVE_DMX_CONFIG_H  -I/usr/include/freetype2   -march=pentium3 -O0 -pipe -ggdb -MT dmxmap.o -MD -MP -MF .deps/dmxmap.Tpo -c -o dmxmap.o dmxmap.c
dmxmotion.c:116:76: error: macro "Xcalloc" requires 2 arguments, but only 1 given
dmxmotion.c: In function 'dmxPointerPutMotionEvent':
dmxmotion.c:116: warning: assignment from incompatible pointer type
make[3]: *** [dmxmotion.o] Error 1
make[3]: *** Waiting for unfinished jobs....
mv -f .deps/dmxmap.Tpo .deps/dmxmap.Po
make[3]: Leaving directory `/var/tmp/portage/x11-base/xorg-server-9999/work/xorg-server-9999/hw/dmx/input'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/var/tmp/portage/x11-base/xorg-server-9999/work/xorg-server-9999/hw/dmx'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/var/tmp/portage/x11-base/xorg-server-9999/work/xorg-server-9999/hw'
make: *** [all-recursive] Error 1

Created attachment 19692 [details] [review]
patch showing fixes to resolve compile errors

The attached patch shows the fixes that had to be made to the latest git pull (Git Commit  d936a4235c9625bd41569cef3452dd086284e0d7) in order for the xorg-server to compile with DMX enabled.

These compile failures where introduced by Git Commit 8a5b89e8e184f4cbf33c6dee0b06e61d8f857576.

See http://cgit.freedesktop.org/xorg/xserver/commit/?id=8a5b89e8e184f4cbf33c6dee0b06e61d8f857576

Confirming fixed in master with these commits:

5a072c55350f4b73d911ea6a2aeddad844924834
8d0cb507ae568c8da92f10ff1188d797bcaa3d1a