diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-04-19 17:41:20 +0400 |
|---|---|---|
| committer | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-04-19 17:46:28 +0400 |
| commit | 9dd52eb86a9122e34c307a9160ae3ccd5706c94e (patch) | |
| tree | 1d599d54564705503b338550f37fc448ac01cc12 /shell | |
| parent | 8a6a940a469bac1c274b988dce713181f044d6c4 (diff) | |
use GLIB_CHECK_VERSION instead of GLIB_VERSION_X_XX
Michael Meeks pointed out that the latter can cause problems.
Change-Id: I68e7f8c6dcfae52305738b2a8cdee72e9c2c7f93
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/backends/gconfbe/gconfaccess.cxx | 2 | ||||
| -rw-r--r-- | shell/source/sessioninstall/SyncDbusSessionHelper.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx index d5b864d72d1a..d1b4b0deb542 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 a39c847cd47c..49c134467920 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 } |