Kaydet (Commit) 9dd52eb8 authored tarafından Ivan Timofeev's avatar Ivan Timofeev

use GLIB_CHECK_VERSION instead of GLIB_VERSION_X_XX

Michael Meeks pointed out that the latter can cause problems.

Change-Id: I68e7f8c6dcfae52305738b2a8cdee72e9c2c7f93
üst 8a6a940a
......@@ -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
......
......@@ -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
}
......
......@@ -885,7 +885,7 @@ TeleManagerImpl::TeleManagerImpl()
mpFileTransferClient( NULL),
mpAccountManager( NULL)
{
#if !defined(GLIB_VERSION_2_36)
#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init();
#endif
}
......
......@@ -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 ) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment