On Sun, Nov 22, 2020 at 07:48:34AM -0000, Dimitri Karamazov wrote: > is this diff okay?
It is part of the update to libX11 1.7.0 that was released earlier this week and that I plan to import in Xenocara. Can you wait until that update ? > > Index: lib/libX11/include/X11/XKBlib.h > =================================================================== > RCS file: /cvs/xenocara/lib/libX11/include/X11/XKBlib.h,v > retrieving revision 1.4 > diff -u -p -r1.4 XKBlib.h > --- lib/libX11/include/X11/XKBlib.h 30 May 2011 19:19:30 -0000 1.4 > +++ lib/libX11/include/X11/XKBlib.h 22 Nov 2020 07:44:40 -0000 > @@ -396,7 +396,11 @@ extern Bool XkbTranslateKeyCode( > > extern int XkbTranslateKeySym( > Display * /* dpy */, > +#if _LIBCPP_STD_VER > 11 > + KeySym * /* sym_return */, > +#else > register KeySym * /* sym_return */, > +#endif > unsigned int /* modifiers */, > char * /* buffer */, > int /* nbytes */, > > Or should I just remove the keyword? > > Index: lib/libX11/include/X11/XKBlib.h > =================================================================== > RCS file: /cvs/xenocara/lib/libX11/include/X11/XKBlib.h,v > retrieving revision 1.4 > diff -u -p -r1.4 XKBlib.h > --- lib/libX11/include/X11/XKBlib.h 30 May 2011 19:19:30 -0000 1.4 > +++ lib/libX11/include/X11/XKBlib.h 22 Nov 2020 07:29:01 -0000 > @@ -396,7 +396,7 @@ extern Bool XkbTranslateKeyCode( > > extern int XkbTranslateKeySym( > Display * /* dpy */, > - register KeySym * /* sym_return */, > + KeySym * /* sym_return */, > unsigned int /* modifiers */, > char * /* buffer */, > int /* nbytes */, -- Matthieu Herrb
