From 382878e6de03e5963ab2159a96bd358a7a755989 Mon Sep 17 00:00:00 2001 From: marguerite Date: Sat, 19 Sep 2015 00:45:43 +0800 Subject: [PATCH] define G_GNUC_BEGIN/END_IGNORE_DEPRECATIONS for glib < 2.32 --- src/scim_table_imengine_setup.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/scim_table_imengine_setup.cpp b/src/scim_table_imengine_setup.cpp index 4b5ec1b..e81a536 100644 --- a/src/scim_table_imengine_setup.cpp +++ b/src/scim_table_imengine_setup.cpp @@ -76,6 +76,19 @@ #define SCIM_TABLES_USE_GTK_TREE_VIEW_SET_RULES_HINT #endif +#if ! GLIB_CHECK_VERSION(2, 32, 0) +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) +#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS \ + _Pragma ("GCC diagnostic push") \ + _Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"") +#define G_GNUC_END_IGNORE_DEPRECATIONS \ + _Pragma ("GCC diagnostic pop") +#else +#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS +#define G_GNUC_END_IGNORE_DEPRECATIONS +#endif +#endif + using namespace scim; #define scim_module_init table_imengine_setup_LTX_scim_module_init -- 2.34.1