diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-16 09:37:37 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-16 09:43:48 +0200 |
| commit | 00eae6f01bf11ec6a90dfc68e607b6a1a250a118 (patch) | |
| tree | b814d518076840b7433d02bc3b5957c1dd54de25 /xorg-server/config | |
| parent | a50d2ee664302147942dd5ed6428f9bab9d4e76a (diff) | |
| parent | d6d3999ccb2cb72d55820770260172eccbbb68d7 (diff) | |
| download | vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.gz vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.tar.bz2 vcxsrv-00eae6f01bf11ec6a90dfc68e607b6a1a250a118.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/securitysrv.h
xorg-server/glx/glxext.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_size_get.c
xorg-server/hw/xwin/winclip.c
xorg-server/hw/xwin/winfont.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winglobals.h
xorg-server/hw/xwin/winmonitors.h
xorg-server/include/closestr.h
xorg-server/include/pixmapstr.h
xorg-server/include/servermd.h
xorg-server/include/site.h
xorg-server/include/windowstr.h
xorg-server/include/xkbstr.h
Diffstat (limited to 'xorg-server/config')
| -rw-r--r-- | xorg-server/config/config-backends.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/xorg-server/config/config-backends.h b/xorg-server/config/config-backends.h index 10743c38a..e5622d51e 100644 --- a/xorg-server/config/config-backends.h +++ b/xorg-server/config/config-backends.h @@ -37,12 +37,12 @@ int config_udev_init(void); void config_udev_fini(void); #else -# ifdef CONFIG_NEED_DBUS +#ifdef CONFIG_NEED_DBUS #include <dbus/dbus.h> -typedef void (*config_dbus_core_connect_hook)(DBusConnection *connection, - void *data); -typedef void (*config_dbus_core_disconnect_hook)(void *data); +typedef void (*config_dbus_core_connect_hook) (DBusConnection * connection, + void *data); +typedef void (*config_dbus_core_disconnect_hook) (void *data); struct config_dbus_core_hook { config_dbus_core_connect_hook connect; @@ -56,17 +56,17 @@ 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 #endif #ifdef CONFIG_WSCONS |