summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--openbsd-compat/bcrypt_pbkdf.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 51eff2d6..54a894d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@
- (dtucker) [poly1305.c] Wrap stdlib.h include inside #ifdef HAVE_STDINT_H.
- (dtucker) [blocks.c fe25519.c ge25519.c hash.c sc25519.c verify.c] Include
includes.h to pull in all of the compatibility stuff.
+ - (dtucker) [openbsd-compat/bcrypt_pbkdf.c] Wrap stdlib.h include inside
+ #ifdef HAVE_STDINT_H.
20140118
- (djm) OpenBSD CVS Sync
diff --git a/openbsd-compat/bcrypt_pbkdf.c b/openbsd-compat/bcrypt_pbkdf.c
index e0736fea..91b6ba07 100644
--- a/openbsd-compat/bcrypt_pbkdf.c
+++ b/openbsd-compat/bcrypt_pbkdf.c
@@ -22,7 +22,9 @@
#include <sys/types.h>
#include <sys/param.h>
-#include <stdlib.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
#include <string.h>
#ifdef HAVE_BLF_H