From b32a248a423667b461a60fb3020c90c77d2584e4 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Sat, 12 Jul 2014 20:07:41 +0000 Subject: [PATCH] sync with OpenBSD. git-svn-id: file:///svn/unbound/trunk@3188 be551aaa-1e26-0410-a405-d3ace91eadb9 --- compat/getentropy_linux.c | 2 -- compat/getentropy_osx.c | 2 -- compat/getentropy_solaris.c | 3 +-- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/compat/getentropy_linux.c b/compat/getentropy_linux.c index 8bfafe444..098b375b8 100644 --- a/compat/getentropy_linux.c +++ b/compat/getentropy_linux.c @@ -68,12 +68,10 @@ #define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l))) #define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x))) -/* (portability) some compilers cannot take sizeof a function pointer */ #define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*))) int getentropy(void *buf, size_t len); -/* referencing functions in other link modules is not portable */ extern int main(int, char *argv[]); static int gotdata(char *buf, size_t len); static int getentropy_urandom(void *buf, size_t len); diff --git a/compat/getentropy_osx.c b/compat/getentropy_osx.c index 8cf46e5ef..b0f78bdff 100644 --- a/compat/getentropy_osx.c +++ b/compat/getentropy_osx.c @@ -70,12 +70,10 @@ #define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l))) #define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x))) -/* (portability) some compilers cannot take sizeof a function pointer */ #define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*))) int getentropy(void *buf, size_t len); -/* referencing functions in other link modules is not portable */ extern int main(int, char *argv[]); static int gotdata(char *buf, size_t len); static int getentropy_urandom(void *buf, size_t len); diff --git a/compat/getentropy_solaris.c b/compat/getentropy_solaris.c index f2857a851..e46501935 100644 --- a/compat/getentropy_solaris.c +++ b/compat/getentropy_solaris.c @@ -61,12 +61,11 @@ #define HR(x, l) (SHA512_Update(&ctx, (char *)(x), (l))) #define HD(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (x))) -/* (portability) some compilers cannot take sizeof a function pointer */ #define HF(x) (SHA512_Update(&ctx, (char *)&(x), sizeof (void*))) int getentropy(void *buf, size_t len); -/* referencing functions in other link modules is not portable */ +/* referencing functions in other link modules is not portable with sun-cc */ /* extern int main(int, char *argv[]); */ static int gotdata(char *buf, size_t len); static int getentropy_urandom(void *buf, size_t len, const char *path, -- 2.47.2