frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

factor out X_REGISTRY_RESOURCE and X_REGISTRY_REQUEST to meson.build 

there are several feautures depending on LookupResourceName() et al,
so set these symbole inside meson.build, instead of #define'ing them
conditionally in registry.h

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1262>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-01-25 18:33:06 +01:00 committed by Marge Bot
parent 84a196e707
commit 834acc88fb
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/meson.build
View File

@ -242,6 +242,12 @@ conf_data.set('XV', build_xv ? '1' : false)
conf_data.set('XvExtension', build_xv ? '1' : false) conf_data.set('XvExtension', build_xv ? '1' : false)
conf_data.set('XvMCExtension', build_xvmc ? '1' : false) conf_data.set('XvMCExtension', build_xvmc ? '1' : false)
# needed by several extensions
build_registry_resource = (build_xselinux or build_res)
conf_data.set('X_REGISTRY_RESOURCE', build_registry_resource ? '1' : false)
build_registry_request = (build_xselinux or build_xsecurity or with_dtrace)
conf_data.set('X_REGISTRY_REQUEST', build_registry_request ? '1' : false)
conf_data.set('HAVE_SHA1_IN_' + sha1.to_upper(), '1', description: 'Use @0@ SHA1 functions'.format(sha1)) conf_data.set('HAVE_SHA1_IN_' + sha1.to_upper(), '1', description: 'Use @0@ SHA1 functions'.format(sha1))
conf_data.set('HAVE_LIBUNWIND', get_option('libunwind')) conf_data.set('HAVE_LIBUNWIND', get_option('libunwind'))

8
include/registry.h
View File

@ -20,14 +20,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "resource.h" #include "resource.h"
#include "extnsionst.h" #include "extnsionst.h"
#if defined(XSELINUX) || defined(RES)
#define X_REGISTRY_RESOURCE 1
#endif
#if defined(XSELINUX) || defined(XCSECURITY) || defined(XSERVER_DTRACE)
#define X_REGISTRY_REQUEST 1
#endif
/* Internal string registry - for auditing, debugging, security, etc. */ /* Internal string registry - for auditing, debugging, security, etc. */
#ifdef X_REGISTRY_RESOURCE #ifdef X_REGISTRY_RESOURCE