diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-06-17 11:59:04 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-06-17 12:25:15 +0200 |
| commit | 1b9d60f9851459c00a9d8a26afb74c9ffc4881fe (patch) | |
| tree | 65eb5a9cdd19228daf32e8df05c7b19f5bee90aa /shared | |
| parent | 45d6baac4d371d4ed709babcdd2d43438c438bb7 (diff) | |
| download | NetworkManager-1b9d60f9851459c00a9d8a26afb74c9ffc4881fe.tar.gz | |
nm-glib: remove G_GNUC_EXTENSION
We use statement expressions all over the place without explicitly
marking them. If that would be a problem, we'd have to change a
*lot* of code. We simply require that as a mandatory feature from
our compiler.
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/nm-utils/nm-glib.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/shared/nm-utils/nm-glib.h b/shared/nm-utils/nm-glib.h index a014e26066..b9fc5c298d 100644 --- a/shared/nm-utils/nm-glib.h +++ b/shared/nm-utils/nm-glib.h @@ -313,14 +313,14 @@ _g_key_file_save_to_file (GKeyFile *key_file, #if GLIB_CHECK_VERSION (2, 36, 0) #define g_credentials_get_unix_pid(creds, error) \ - G_GNUC_EXTENSION ({ \ + ({ \ G_GNUC_BEGIN_IGNORE_DEPRECATIONS \ (g_credentials_get_unix_pid) ((creds), (error)); \ G_GNUC_END_IGNORE_DEPRECATIONS \ }) #else #define g_credentials_get_unix_pid(creds, error) \ - G_GNUC_EXTENSION ({ \ + ({ \ struct ucred *native_creds; \ \ native_creds = g_credentials_get_native ((creds), G_CREDENTIALS_TYPE_LINUX_UCRED); \ @@ -357,12 +357,12 @@ _nm_g_hash_table_get_keys_as_array (GHashTable *hash_table, #endif #if !GLIB_CHECK_VERSION(2, 40, 0) #define g_hash_table_get_keys_as_array(hash_table, length) \ - G_GNUC_EXTENSION ({ \ + ({ \ _nm_g_hash_table_get_keys_as_array (hash_table, length); \ }) #else #define g_hash_table_get_keys_as_array(hash_table, length) \ - G_GNUC_EXTENSION ({ \ + ({ \ G_GNUC_BEGIN_IGNORE_DEPRECATIONS \ (g_hash_table_get_keys_as_array) ((hash_table), (length)); \ G_GNUC_END_IGNORE_DEPRECATIONS \ @@ -412,12 +412,12 @@ _nm_g_strv_contains (const gchar * const *strv, #endif #if !GLIB_CHECK_VERSION(2, 44, 0) #define g_strv_contains(strv, str) \ - G_GNUC_EXTENSION ({ \ + ({ \ _nm_g_strv_contains (strv, str); \ }) #else #define g_strv_contains(strv, str) \ - G_GNUC_EXTENSION ({ \ + ({ \ G_GNUC_BEGIN_IGNORE_DEPRECATIONS \ (g_strv_contains) ((strv), (str)); \ G_GNUC_END_IGNORE_DEPRECATIONS \ |