diff options
| author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-02-14 16:51:17 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-03-03 23:07:18 +0000 |
| commit | ebabca56a4ca1980bfae557a9c0ac32b86a85a0c (patch) | |
| tree | a0dc6d51a4dde2c9e8317d6c4b624cb6da411a6c /include | |
| parent | 77f9792911e2a3c48bb6e5d17b9f3090f1b0c343 (diff) | |
consolidate MITSHM and HAS_SHM symbols
Both symbols are set on exactly the same condition (build_mitshm),
so can be consolidated into one: MITSHM
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1296>
Diffstat (limited to 'include')
| -rw-r--r-- | include/meson.build | 1 | ||||
| -rw-r--r-- | include/xorg-server.h.meson.in | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/meson.build b/include/meson.build index 7d83273b9..a3146ffa9 100644 --- a/include/meson.build +++ b/include/meson.build @@ -212,7 +212,6 @@ conf_data.set('DRI3', build_dri3 ? '1' : false) if build_glx conf_data.set_quoted('DRI_DRIVER_PATH', dri_dep.get_variable(pkgconfig : 'dridriverdir')) endif -conf_data.set('HAS_SHM', build_mitshm ? '1' : false) conf_data.set('MITSHM', build_mitshm ? '1' : false) conf_data.set('PANORAMIX', build_xinerama ? '1' : false) conf_data.set('PRESENT', '1') diff --git a/include/xorg-server.h.meson.in b/include/xorg-server.h.meson.in index 093801cad..1ffc58548 100644 --- a/include/xorg-server.h.meson.in +++ b/include/xorg-server.h.meson.in @@ -41,9 +41,6 @@ /* Support XDM-AUTH*-1 */ #mesondefine HASXDMAUTH -/* Support SHM */ -#mesondefine HAS_SHM - /* Define to 1 if you have the `reallocarray' function. */ #mesondefine HAVE_REALLOCARRAY |