Commit 23451ef2 authored by David Goulet's avatar David Goulet
Browse files

Merge branch 'maint-0.4.6'

parents 2b97c1dd f2647295
......@@ -17,9 +17,11 @@
#include "lib/log/util_bug.h"
#include "lib/malloc/malloc.h"
DISABLE_GCC_WARNING("-Wstrict-prototypes")
#include <cryptohi.h>
#include <keyhi.h>
#include <pk11pub.h>
ENABLE_GCC_WARNING("-Wstrict-prototypes")
static int dh_initialized = 0;
static SECKEYDHParams tls_dh_param, circuit_dh_param;
......
......@@ -50,9 +50,11 @@ ENABLE_GCC_WARNING("-Wredundant-decls")
#endif /* defined(ENABLE_OPENSSL) */
#ifdef ENABLE_NSS
DISABLE_GCC_WARNING("-Wstrict-prototypes")
#include <pk11pub.h>
#include <secerr.h>
#include <prerror.h>
ENABLE_GCC_WARNING("-Wstrict-prototypes")
#endif
#if __GNUC__ && GCC_VERSION >= 402
......
......@@ -23,9 +23,11 @@
#include <string.h>
DISABLE_GCC_WARNING("-Wstrict-prototypes")
#include <keyhi.h>
#include <pk11pub.h>
#include <secder.h>
ENABLE_GCC_WARNING("-Wstrict-prototypes")
#ifdef ENABLE_OPENSSL
#include <openssl/rsa.h>
......
......@@ -26,7 +26,9 @@
#include <openssl/evp.h>
#endif
#ifdef ENABLE_NSS
DISABLE_GCC_WARNING("-Wstrict-prototypes")
#include <pk11pub.h>
ENABLE_GCC_WARNING("-Wstrict-prototypes")
#endif
#if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_LIBSCRYPT_SCRYPT)
......
......@@ -20,11 +20,13 @@
#include "lib/encoding/time_fmt.h"
#include "lib/string/printf.h"
DISABLE_GCC_WARNING("-Wstrict-prototypes")
#include <pk11pub.h>
#include <cryptohi.h>
#include <cert.h>
#include <keyhi.h>
#include <time.h>
ENABLE_GCC_WARNING("-Wstrict-prototypes")
/* Units of PRTime per second.
*
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment