diff options
| author | Sebastian Dröge <slomo@coaxion.net> | 2020-08-17 11:57:24 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@coaxion.net> | 2020-08-17 11:57:24 +0000 |
| commit | fb6da5677b284e774eed63b2cd194ec5b741b0d4 (patch) | |
| tree | 2e7aaba55f842570d0a187b716d5e3f08785d0cc /gio | |
| parent | a396fa9027bf9aaab0697789fe38efec53b09431 (diff) | |
| parent | 5f25d2569df043ab1adecb33f5325eff6e651744 (diff) | |
| download | glib-fb6da5677b284e774eed63b2cd194ec5b741b0d4.tar.gz | |
Merge branch 'wip/pwithnall/coverity' into 'master'
CI support for Coverity Scan
See merge request GNOME/glib!1593
Diffstat (limited to 'gio')
| -rw-r--r-- | gio/gdesktopappinfo.c | 2 | ||||
| -rw-r--r-- | gio/giomodule.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index ed98570fe..b779b309b 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c @@ -26,7 +26,9 @@ /* For the #GDesktopAppInfoLookup macros; since macro deprecation is implemented * in the preprocessor, we need to define this before including glib.h*/ +#ifndef GLIB_DISABLE_DEPRECATION_WARNINGS #define GLIB_DISABLE_DEPRECATION_WARNINGS +#endif #include <errno.h> #include <string.h> diff --git a/gio/giomodule.c b/gio/giomodule.c index d8d64be51..dc4d6d3b3 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c @@ -22,7 +22,9 @@ /* For the #GDesktopAppInfoLookup macros; since macro deprecation is implemented * in the preprocessor, we need to define this before including glib.h*/ +#ifndef GLIB_DISABLE_DEPRECATION_WARNINGS #define GLIB_DISABLE_DEPRECATION_WARNINGS +#endif #include <string.h> |