error: `XICCallback' undeclared (Solaris build problem)

[Petr Sumbera]

Hi all,

It seems that following change from last Friday broke Solaris build:

http://source.winehq.org/git/wine.git/?a=commitdiff;h=185157cb6eb25bc5e75e9a260b593e98153d2255

This is probably because Solaris /usr/include/X11/Xlib.h doesn't define 
XICCallback.

-bash-3.2$ grep XICCallback /usr/include/X11/Xlib.h
-bash-3.2$

Compilation error is following:

gcc -c -I. -I. -I../../include -I../../include  -D__WINESRC__ 
-D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing 
-Wdeclaration-after-statement -Wwrite-strings -Wpointer-arith 
-std=gnu99  -o xim.o xim.c
xim.c: In function `X11DRV_DestroyIM':
xim.c:371: warning: passing arg 5 of `XRegisterIMInstantiateCallback' 
from incompatible pointer type
xim.c: In function `X11DRV_OpenIM':
xim.c:398: warning: assignment from incompatible pointer type
xim.c:475: warning: passing arg 5 of `XUnregisterIMInstantiateCallback' 
from incompatible pointer type
xim.c: In function `X11DRV_SetupXIM':
xim.c:485: warning: passing arg 5 of `XRegisterIMInstantiateCallback' 
from incompatible pointer type
xim.c: In function `X11DRV_CreateIC':
xim.c:504: error: `XICCallback' undeclared (first use in this function)
xim.c:504: error: (Each undeclared identifier is reported only once
xim.c:504: error: for each function it appears in.)
xim.c:504: error: syntax error before "destroy"
xim.c:500: warning: unused variable `spot'
xim.c:501: warning: unused variable `preedit'
xim.c:502: warning: unused variable `status'
xim.c:503: warning: unused variable `xic'
...

Any idea or comment to this?

Thanks,

Petr