noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Regenerate X11 wrappers with dynload-wrapper 0.7

Browse Source 
Dynload-wrapper 0.7 introduces the --include-dir option which lets us restrict
what headers are considered for generation.

In this case it removes the `XFreeThreads` Xlib function which does not
exist on Ubuntu 22.04 and older.
This commit is contained in:
HP van Braam
2024-12-12 14:52:37 +01:00
parent 19e003bc08
commit dbbacf3d0e
14 changed files with 16 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.h
+2 -6
View File
@@ -2,8 +2,8 @@
#define DYLIBLOAD_WRAPPER_XLIB
// This file is generated. Do not edit!
// see https://github.com/hpvb/dynload-wrapper for details
// generated by generate-wrapper.py 0.6 on 2024-11-09 02:52:36
// flags: generate-wrapper.py --include ./thirdparty/linuxbsd_headers/X11/Xlib.h --include ./thirdparty/linuxbsd_headers/X11/Xutil.h --include ./thirdparty/linuxbsd_headers/X11/XKBlib.h --sys-include thirdparty/linuxbsd_headers/X11/Xlib.h --sys-include thirdparty/linuxbsd_headers/X11/Xutil.h --sys-include thirdparty/linuxbsd_headers/X11/XKBlib.h --soname libX11.so.6 --init-name xlib --omit-prefix XkbGetDeviceIndicatorState --omit-prefix XkbAddSymInterpret --output-header ./platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.h --output-implementation ./platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.c
// generated by generate-wrapper.py 0.7 on 2024-12-12 14:47:34
// flags: generate-wrapper.py --include ./thirdparty/linuxbsd_headers/X11/Xlib.h --include ./thirdparty/linuxbsd_headers/X11/Xutil.h --include ./thirdparty/linuxbsd_headers/X11/XKBlib.h --sys-include thirdparty/linuxbsd_headers/X11/Xlib.h --sys-include thirdparty/linuxbsd_headers/X11/Xutil.h --sys-include thirdparty/linuxbsd_headers/X11/XKBlib.h --soname libX11.so.6 --init-name xlib --omit-prefix XkbGetDeviceIndicatorState --omit-prefix XkbAddSymInterpret --output-header ./platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.h --include-dir ./thirdparty/linuxbsd_headers/ --output-implementation ./platform/linuxbsd/x11/dynwrappers/xlib-so_wrap.c
//
#include <stdint.h>
@@ -420,7 +420,6 @@
#define _Xwctomb _Xwctomb_dylibloader_orig_xlib
#define XGetEventData XGetEventData_dylibloader_orig_xlib
#define XFreeEventData XFreeEventData_dylibloader_orig_xlib
#define XFreeThreads XFreeThreads_dylibloader_orig_xlib
#define XAllocClassHint XAllocClassHint_dylibloader_orig_xlib
#define XAllocIconSize XAllocIconSize_dylibloader_orig_xlib
#define XAllocSizeHints XAllocSizeHints_dylibloader_orig_xlib
@@ -1028,7 +1027,6 @@
#undef _Xwctomb
#undef XGetEventData
#undef XFreeEventData
#undef XFreeThreads
#undef XAllocClassHint
#undef XAllocIconSize
#undef XAllocSizeHints
@@ -1636,7 +1634,6 @@ extern "C" {
#define _Xwctomb _Xwctomb_dylibloader_wrapper_xlib
#define XGetEventData XGetEventData_dylibloader_wrapper_xlib
#define XFreeEventData XFreeEventData_dylibloader_wrapper_xlib
#define XFreeThreads XFreeThreads_dylibloader_wrapper_xlib
#define XAllocClassHint XAllocClassHint_dylibloader_wrapper_xlib
#define XAllocIconSize XAllocIconSize_dylibloader_wrapper_xlib
#define XAllocSizeHints XAllocSizeHints_dylibloader_wrapper_xlib
@@ -2241,7 +2238,6 @@ extern int (*_Xmbtowc_dylibloader_wrapper_xlib)(wchar_t *, char *, int);
extern int (*_Xwctomb_dylibloader_wrapper_xlib)(char *, wchar_t);
extern int (*XGetEventData_dylibloader_wrapper_xlib)(Display *, XGenericEventCookie *);
extern void (*XFreeEventData_dylibloader_wrapper_xlib)(Display *, XGenericEventCookie *);
extern int (*XFreeThreads_dylibloader_wrapper_xlib)(void);
extern XClassHint *(*XAllocClassHint_dylibloader_wrapper_xlib)(void);
extern XIconSize *(*XAllocIconSize_dylibloader_wrapper_xlib)(void);
extern XSizeHints *(*XAllocSizeHints_dylibloader_wrapper_xlib)(void);