mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use GLIB_CHECK_VERSION instead of GLIB_VERSION_X_XX

Browse Source 
Michael Meeks pointed out that the latter can cause problems.

Change-Id: I68e7f8c6dcfae52305738b2a8cdee72e9c2c7f93
This commit is contained in:
Ivan Timofeev 2013-04-19 17:41:20 +04:00
parent 8a6a940a46
commit 9dd52eb86a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/source/backends/gconfbe/gconfaccess.cxx
View File

@ -51,7 +51,7 @@ GConfClient* getGconfClient()
static GConfClient* mClient= 0; static GConfClient* mClient= 0;
if (mClient == NULL) if (mClient == NULL)
{ {
#if !defined(GLIB_VERSION_2_36) #if !GLIB_CHECK_VERSION(2,36,0)
/* initialize glib object type library */ /* initialize glib object type library */
g_type_init(); g_type_init();
#endif #endif

2
shell/source/sessioninstall/SyncDbusSessionHelper.cxx
View File

@ -62,7 +62,7 @@ namespace shell { namespace sessioninstall
{ {
SyncDbusSessionHelper::SyncDbusSessionHelper(Reference<XComponentContext> const&) SyncDbusSessionHelper::SyncDbusSessionHelper(Reference<XComponentContext> const&)
{ {
#if !defined(GLIB_VERSION_2_36) #if !GLIB_CHECK_VERSION(2,36,0)
g_type_init (); g_type_init ();
#endif #endif
} }

2
tubes/source/manager.cxx
View File

@ -885,7 +885,7 @@ TeleManagerImpl::TeleManagerImpl()
mpFileTransferClient( NULL), mpFileTransferClient( NULL),
mpAccountManager( NULL) mpAccountManager( NULL)
{ {
#if !defined(GLIB_VERSION_2_36) #if !GLIB_CHECK_VERSION(2,36,0)
g_type_init(); g_type_init();
#endif #endif
} }

2
ucb/source/ucp/gio/gio_provider.cxx
View File

@ -100,7 +100,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpgio1_component_getFactory( co
uno::Reference< lang::XMultiServiceFactory > xSMgr uno::Reference< lang::XMultiServiceFactory > xSMgr
(reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); (reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
uno::Reference< lang::XSingleServiceFactory > xFactory; uno::Reference< lang::XSingleServiceFactory > xFactory;
#if !defined(GLIB_VERSION_2_36) #if !GLIB_CHECK_VERSION(2,36,0)
g_type_init(); g_type_init();
#endif #endif
if ( !::gio::ContentProvider::getImplementationName_Static().compareToAscii( pImplName ) ) if ( !::gio::ContentProvider::getImplementationName_Static().compareToAscii( pImplName ) )