diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-23 10:05:55 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-23 10:05:55 +0100 |
| commit | 0f834b91a4768673833ab4917e87d86c237bb1a6 (patch) | |
| tree | 363489504ed4b2d360259b8de4c9e392918e5d02 /xorg-server/config/config.c | |
| parent | fc72edebf875378459368c5383d9023730cbca54 (diff) | |
| download | vcxsrv-0f834b91a4768673833ab4917e87d86c237bb1a6.tar.gz vcxsrv-0f834b91a4768673833ab4917e87d86c237bb1a6.tar.bz2 vcxsrv-0f834b91a4768673833ab4917e87d86c237bb1a6.zip | |
libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update
23 Mar 2012
Diffstat (limited to 'xorg-server/config/config.c')
| -rw-r--r-- | xorg-server/config/config.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/xorg-server/config/config.c b/xorg-server/config/config.c index 0dae3ad68..2b96dbb74 100644 --- a/xorg-server/config/config.c +++ b/xorg-server/config/config.c @@ -40,21 +40,21 @@ config_init(void) ErrorF("[config] failed to initialise udev\n"); #elif defined(CONFIG_NEED_DBUS) if (config_dbus_core_init()) { -# ifdef CONFIG_DBUS_API - if (!config_dbus_init()) - ErrorF("[config] failed to initialise D-Bus API\n"); -# endif -# ifdef CONFIG_HAL +#ifdef CONFIG_DBUS_API + if (!config_dbus_init()) + ErrorF("[config] failed to initialise D-Bus API\n"); +#endif +#ifdef CONFIG_HAL if (!config_hal_init()) ErrorF("[config] failed to initialise HAL\n"); -# endif +#endif } else { - ErrorF("[config] failed to initialise D-Bus core\n"); + ErrorF("[config] failed to initialise D-Bus core\n"); } #elif defined(CONFIG_WSCONS) if (!config_wscons_init()) - ErrorF("[config] failed to initialise wscons\n"); + ErrorF("[config] failed to initialise wscons\n"); #endif } @@ -64,12 +64,12 @@ config_fini(void) #if defined(CONFIG_UDEV) config_udev_fini(); #elif defined(CONFIG_NEED_DBUS) -# ifdef CONFIG_HAL +#ifdef CONFIG_HAL config_hal_fini(); -# endif -# ifdef CONFIG_DBUS_API +#endif +#ifdef CONFIG_DBUS_API config_dbus_fini(); -# endif +#endif config_dbus_core_fini(); #elif defined(CONFIG_WSCONS) config_wscons_fini(); @@ -112,18 +112,15 @@ device_is_duplicate(const char *config_info) { DeviceIntPtr dev; - for (dev = inputInfo.devices; dev; dev = dev->next) - { + for (dev = inputInfo.devices; dev; dev = dev->next) { if (dev->config_info && (strcmp(dev->config_info, config_info) == 0)) return TRUE; } - for (dev = inputInfo.off_devices; dev; dev = dev->next) - { + for (dev = inputInfo.off_devices; dev; dev = dev->next) { if (dev->config_info && (strcmp(dev->config_info, config_info) == 0)) return TRUE; } return FALSE; } - |