mirror of
https://gitlab.freedesktop.org/xorg/xserver.git
synced 2026-06-07 14:38:17 +02:00
58a086d907
Commitb5b52979has split the options "udev" and "udev_kms" for systems without systemd. Yet, when building with "-Dudev=false", "udev_kms" still defaults to true. That breaks the build because "config_udev_odev_probe()" is not defined: | config/config.c: In function ‘config_odev_probe’: | config/config.c:77:5: error: implicit declaration of function | ‘config_udev_odev_probe’; did you mean | ‘config_odev_probe’? | [-Wimplicit-function-declaration] | 77 | config_udev_odev_probe(probe_callback); | | ^~~~~~~~~~~~~~~~~~~~~~ | | config_odev_probe | config/config.c:77:5: warning: nested extern declaration of | ‘config_udev_odev_probe’ [-Wnested-externs] Yet, the code of the function "config_udev_odev_probe()" in config/udev.c is within a "#ifdef udev_kms" conditional, so it is built. The problem is that the function definition is within an "#ifdef udev" in the "config_backends.h" header. So, even though the actual code is compiled, the compiler will fail to find the function definition, hence the "implicit declaration" error. To avoid the issue, move the function definition within a separate "udev_kms" conditional in the "config-backends.h" header file. Closes: https://gitlab.freedesktop.org/xorg/xserver/-/work_items/1890 Fixes:b5b52979("meson: split udev from udev_kms which requires systemd") Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2203>
48 lines
1.8 KiB
C
48 lines
1.8 KiB
C
/*
|
|
* Copyright © 2006-2007 Daniel Stone
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Author: Daniel Stone <daniel@fooishbar.org>
|
|
*/
|
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
#include <dix-config.h>
|
|
#endif
|
|
#include "input.h"
|
|
#include "list.h"
|
|
|
|
void remove_devices(const char *backend, const char *config_info);
|
|
BOOL device_is_duplicate(const char *config_info);
|
|
|
|
#ifdef CONFIG_UDEV
|
|
int config_udev_pre_init(void);
|
|
int config_udev_init(void);
|
|
void config_udev_fini(void);
|
|
#elif defined(CONFIG_HAL)
|
|
int config_hal_init(void);
|
|
void config_hal_fini(void);
|
|
#elif defined(CONFIG_WSCONS)
|
|
int config_wscons_init(void);
|
|
void config_wscons_fini(void);
|
|
#endif
|
|
#ifdef CONFIG_UDEV_KMS
|
|
void config_udev_odev_probe(config_odev_probe_proc_ptr probe_callback);
|
|
#endif
|