diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
| commit | 4b1326f06330c00501dd84100ed3a1987e2fa631 (patch) | |
| tree | 6675ebcf771a6fdfeb9a2164f08811407731482e /xorg-server/config/config-backends.h | |
| parent | 7397e255c2e82618ab55ef2c81636c8e688b1225 (diff) | |
| parent | 163827567b71b0763a4c1a7104159cd08b5c2d95 (diff) | |
| download | vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.gz vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.bz2 vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/config/config-backends.h')
| -rw-r--r-- | xorg-server/config/config-backends.h | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/xorg-server/config/config-backends.h b/xorg-server/config/config-backends.h index 907e86b9c..0a2a22af0 100644 --- a/xorg-server/config/config-backends.h +++ b/xorg-server/config/config-backends.h @@ -26,8 +26,18 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif +#include "input.h" -#ifdef CONFIG_NEED_DBUS +void remove_devices(const char *backend, const char *config_info); +BOOL device_is_duplicate(const char *config_info); +void add_option(InputOption **options, const char *key, const char *value); + +#ifdef CONFIG_UDEV +int config_udev_init(void); +void config_udev_fini(void); +#else + +# ifdef CONFIG_NEED_DBUS #include <dbus/dbus.h> typedef void (*config_dbus_core_connect_hook)(DBusConnection *connection, @@ -46,14 +56,15 @@ int config_dbus_core_init(void); void config_dbus_core_fini(void); int config_dbus_core_add_hook(struct config_dbus_core_hook *hook); void config_dbus_core_remove_hook(struct config_dbus_core_hook *hook); -#endif +# endif -#ifdef CONFIG_DBUS_API +# ifdef CONFIG_DBUS_API int config_dbus_init(void); void config_dbus_fini(void); -#endif +# endif -#ifdef CONFIG_HAL +# ifdef CONFIG_HAL int config_hal_init(void); void config_hal_fini(void); +# endif #endif |