[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  5006c32253483ba232dd441c28624801195cd7b5 (commit)
      from  1d2932de4cefcc200f175863a42c311916269981 (commit)


- Log -----------------------------------------------------------------
commit 5006c32253483ba232dd441c28624801195cd7b5
Author: Clang via Jeffrey Walton <noloader at gmail.com>
Date:   Thu Feb 12 11:20:48 2015 -0500

    RT3684: rand_egd needs stddef.h
    
    And remove backup definition of offsetof.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/rand/rand_egd.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/crypto/rand/rand_egd.c b/crypto/rand/rand_egd.c
index 53d7a2b..44ed4bb 100644
--- a/crypto/rand/rand_egd.c
+++ b/crypto/rand/rand_egd.c
@@ -113,6 +113,7 @@ int RAND_egd_bytes(const char *path, int bytes)
 #else
 # include <openssl/opensslconf.h>
 # include OPENSSL_UNISTD
+# include <stddef.h>
 # include <sys/types.h>
 # include <sys/socket.h>
 # ifndef NO_SYS_UN_H
@@ -130,10 +131,6 @@ struct sockaddr_un {
 # include <string.h>
 # include <errno.h>
 
-# ifndef offsetof
-#  define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-# endif
-
 int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
 {
     int ret = 0;