Compilation of master with pgtk and xwidgets is broken since commit 16c785b621

Compilation of master with pgtk and xwidgets is broken since commit 16c785b621

[Iñigo Serna]

Hi,

Compilation of master with pgtk and xwidgets is broken since 
commit
16c785b621. I added the error at the end of the email.

I simple fix is to move "#include <cairo-xlib.h>" in file 
src/xwidget.c
line 42 one line below, inside #ifndef HAVE_PGTK.

Thanks,
-- 
Iñigo Serna


```
make[1]: Entering directory 
'/home/_compiling/linux/devel/emacs.git/src'
  CC       xwidget.o
In file included from /usr/include/X11/Xlib.h:44,
                 from /usr/include/cairo/cairo-xlib.h:44,
                 from xwidget.c:42:
/usr/include/X11/X.h:96:13: error: conflicting types for ‘Window’; 
have ‘XID’ {aka ‘long unsigned int’}
   96 | typedef XID Window;
      |             ^~~~~~
In file included from dispextern.h:133,
                 from composite.h:29,
                 from coding.h:284,
                 from xwidget.c:23:
pgtkgui.h:49:13: note: previous declaration of ‘Window’ with type 
‘Window’ {aka ‘int’}
   49 | typedef int Window;
      |             ^~~~~~
In file included from /usr/include/cairo/cairo-xlib.h:44,
                 from xwidget.c:42:
/usr/include/X11/Xlib.h:433:3: error: conflicting types for 
‘XRectangle’; have ‘struct <anonymous>’
  433 | } XRectangle;
      |   ^~~~~~~~~~
In file included from dispextern.h:133,
                 from composite.h:29,
                 from coding.h:284,
                 from xwidget.c:23:
pgtkgui.h:62:3: note: previous declaration of ‘XRectangle’ with 
type ‘XRectangle’
   62 | } XRectangle;
      |   ^~~~~~~~~~
In file included from /usr/include/cairo/cairo-xlib.h:44,
                 from xwidget.c:42:
/usr/include/X11/Xlib.h:487:26: error: conflicting types for 
‘Display’; have ‘struct _XDisplay’
  487 | typedef struct _XDisplay Display;
      |                          ^~~~~~~
In file included from dispextern.h:133,
                 from composite.h:29,
                 from coding.h:284,
                 from xwidget.c:23:
pgtkgui.h:50:28: note: previous declaration of ‘Display’ with type 
‘Display’ {aka ‘struct _GdkDisplay’}
   50 | typedef struct _GdkDisplay Display;
      |                            ^~~~~~~
In file included from /usr/include/cairo/cairo-xlib.h:44,
                 from xwidget.c:42:
/usr/include/X11/Xlib.h:1024:3: error: conflicting types for 
‘XCharStruct’; have ‘struct <anonymous>’
 1024 | } XCharStruct;
      |   ^~~~~~~~~~~
In file included from dispextern.h:133,
                 from composite.h:29,
                 from coding.h:284,
                 from xwidget.c:23:
pgtkgui.h:30:3: note: previous declaration of ‘XCharStruct’ with 
type ‘XCharStruct’ {aka ‘struct _XCharStruct’}
   30 | } XCharStruct;
      |   ^~~~~~~~~~~
In file included from /usr/include/cairo/cairo-xlib.h:44,
                 from xwidget.c:42:
/usr/include/X11/Xlib.h:1067:3: error: conflicting types for 
‘XChar2b’; have ‘struct <anonymous>’
 1067 | } XChar2b;
      |   ^~~~~~~
In file included from dispextern.h:133,
                 from composite.h:29,
                 from coding.h:284,
                 from xwidget.c:23:
pgtkgui.h:34:17: note: previous declaration of ‘XChar2b’ with type 
‘XChar2b’ {aka ‘short unsigned int’}
   34 | typedef unichar XChar2b;
      |                 ^~~~~~~
make[1]: *** [Makefile:411: xwidget.o] Error 1
make[1]: Leaving directory 
'/home/_compiling/linux/devel/emacs.git/src'
make: *** [Makefile:469: src] Error 2
```

Re: Compilation of master with pgtk and xwidgets is broken since commit 16c785b621

[Po Lu]

Iñigo Serna <inigoserna@gmail.com> writes:

> Hi,
>
> Compilation of master with pgtk and xwidgets is broken since commit
> 16c785b621. I added the error at the end of the email.
>
> I simple fix is to move "#include <cairo-xlib.h>" in file
> src/xwidget.c
> line 42 one line below, inside #ifndef HAVE_PGTK.

Thanks, now fixed on master.

Re: Compilation of master with pgtk and xwidgets is broken since commit 16c785b621

[Iñigo Serna]

Thanks for the quick fix.
--
Iñigo

On 22 January 2022 at 13:29 +01, Po Lu <luangruo@yahoo.com> wrote:

> Iñigo Serna <inigoserna@gmail.com> writes:
>
>> Hi,
>>
>> Compilation of master with pgtk and xwidgets is broken since 
>> commit
>> 16c785b621. I added the error at the end of the email.
>>
>> I simple fix is to move "#include <cairo-xlib.h>" in file
>> src/xwidget.c
>> line 42 one line below, inside #ifndef HAVE_PGTK.
>
> Thanks, now fixed on master.