diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-04-19 17:41:20 +0400 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-08-23 15:50:47 +0200 |
| commit | 970dcd197a69cbc6f6801fbf51299ac1e8f7c4ef (patch) | |
| tree | 6fef6e34447c64027f6010d86f8c0e15e23a8d47 | |
| parent | 906e5677ae9255ff2aac735ce6e91ab222ba58e6 (diff) | |
use GLIB_CHECK_VERSION instead of GLIB_VERSION_X_XX
Michael Meeks pointed out that the latter can cause problems.
Change-Id: I68e7f8c6dcfae52305738b2a8cdee72e9c2c7f93
(cherry picked from commit 9dd52eb86a9122e34c307a9160ae3ccd5706c94e)
| -rw-r--r-- | shell/source/backends/gconfbe/gconfaccess.cxx | 2 | ||||
| -rw-r--r-- | shell/source/sessioninstall/SyncDbusSessionHelper.cxx | 2 | ||||
| -rw-r--r-- | tubes/source/manager.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/gio/gio_provider.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx index 532fd1003929..70016abb4f57 100644 --- a/shell/source/backends/gconfbe/gconfaccess.cxx +++ b/shell/source/backends/gconfbe/gconfaccess.cxx @@ -51,7 +51,7 @@ GConfClient* getGconfClient() static GConfClient* mClient= 0; if (mClient == NULL) { -#if !defined(GLIB_VERSION_2_36) +#if !GLIB_CHECK_VERSION(2,36,0) /* initialize glib object type library */ g_type_init(); #endif diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx index 996754875fe2..4c3baf5ecdbc 100644 --- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx +++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx @@ -62,7 +62,7 @@ namespace shell { namespace sessioninstall { SyncDbusSessionHelper::SyncDbusSessionHelper(Reference<XComponentContext> const&) { -#if !defined(GLIB_VERSION_2_36) +#if !GLIB_CHECK_VERSION(2,36,0) g_type_init (); #endif } diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx index a3c8990fdbb1..0a97aeb17adb 100644 --- a/tubes/source/manager.cxx +++ b/tubes/source/manager.cxx @@ -889,7 +889,7 @@ TeleManagerImpl::TeleManagerImpl() mpFileTransferClient( NULL), mpAccountManager( NULL) { -#if !defined(GLIB_VERSION_2_36) +#if !GLIB_CHECK_VERSION(2,36,0) g_type_init(); #endif } diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index c95117bee6cb..bf6a5012093c 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -100,7 +100,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpgio1_component_getFactory( co uno::Reference< lang::XMultiServiceFactory > xSMgr (reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; -#if !defined(GLIB_VERSION_2_36) +#if !GLIB_CHECK_VERSION(2,36,0) g_type_init(); #endif if ( !::gio::ContentProvider::getImplementationName_Static().compareToAscii( pImplName ) ) |