diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-07-02 11:35:14 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-07-02 11:52:25 +0200 |
| commit | c6c4e39b012d544c1f1ed816686c8ae1599da793 (patch) | |
| tree | 094d5e07c1d135d0ee67d99e051fd6a9a367a6a4 /libnm-core/nm-crypto-nss.c | |
| parent | 7368e45ff5b3b8b328d55408bcd403e4d6c564d0 (diff) | |
| parent | acd7b014c72673f5b0c0b91309e27028886da167 (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'libnm-core/nm-crypto-nss.c')
| -rw-r--r-- | libnm-core/nm-crypto-nss.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libnm-core/nm-crypto-nss.c b/libnm-core/nm-crypto-nss.c index 60c8dfb5..5dbbef00 100644 --- a/libnm-core/nm-crypto-nss.c +++ b/libnm-core/nm-crypto-nss.c @@ -8,6 +8,7 @@ #include "nm-crypto-impl.h" +NM_PRAGMA_WARNING_DISABLE ("-Wstrict-prototypes") #include <prinit.h> #include <nss.h> #include <pk11pub.h> @@ -17,6 +18,7 @@ #include <p12.h> #include <ciferfam.h> #include <p12plcy.h> +NM_PRAGMA_WARNING_REENABLE #include "nm-glib-aux/nm-secret-utils.h" #include "nm-errors.h" |