Guard individual compatibility header prototypes.

This is to avoid redefining prototypes from the libc headers. Also,
simplify the autoconf function checks and remove some copy/paste
errors checking for 'write'.

ok wouter@
This commit is contained in:
Brent Cook
2014-07-28 12:09:38 -05:00
parent cd168d519b
commit 981fc3618a
4 changed files with 71 additions and 45 deletions

View File

@@ -7,10 +7,18 @@
#include <sys/time.h>
#include <stdint.h>
#ifdef NO_ARC4RANDOM_BUF
uint32_t arc4random(void);
void arc4random_buf(void *_buf, size_t n);
#endif
#ifdef NO_REALLOCARRAY
void *reallocarray(void *, size_t, size_t);
#endif
#ifdef NO_STRTONUM
long long strtonum(const char *nptr, long long minval,
long long maxval, const char **errstr);
#endif
#endif

View File

@@ -12,21 +12,34 @@
#include <strings.h>
#endif
#ifdef NO_STRLCPY
size_t strlcpy(char *dst, const char *src, size_t siz);
#endif
#ifdef NO_STRLCAT
size_t strlcat(char *dst, const char *src, size_t siz);
#endif
#ifdef NO_STRNDUP
char * strndup(const char *str, size_t maxlen);
size_t strnlen(const char *str, size_t maxlen);
#endif
#ifdef NO_EXPLICIT_BZERO
void explicit_bzero(void *, size_t);
#endif
#ifdef NO_TIMINGSAFE_BCMP
int timingsafe_bcmp(const void *b1, const void *b2, size_t n);
#endif
#ifdef NO_TIMINGSAFE_MEMCMP
int timingsafe_memcmp(const void *b1, const void *b2, size_t len);
#endif
#ifdef NO_MEMMEM
void * memmem(const void *big, size_t big_len, const void *little,
size_t little_len);
#endif
#endif

View File

@@ -3,7 +3,12 @@
#ifndef LIBCRYPTOCOMPAT_UNISTD_H
#define LIBCRYPTOCOMPAT_UNISTD_H
#ifdef NO_GETENTROPY
int getentropy(void *buf, size_t buflen);
#endif
#ifdef NO_ISSETUGID
int issetugid(void);
#endif
#endif