[openssl-commits] [openssl] master update

[Andy Polyakov]

The branch master has been updated
       via  a0e53000a8d2f464c5a49e93abaa606e67d7558e (commit)
      from  ce5eb5e8149d8d03660575f4b8504c993851988a (commit)


- Log -----------------------------------------------------------------
commit a0e53000a8d2f464c5a49e93abaa606e67d7558e
Author: Andy Polyakov <appro at openssl.org>
Date:   Fri Jun 29 18:46:57 2018 +0200

    rand/rand_unix.c: address macro redifinition warning.
    
    Occasionally, e.g. when compiling for elderly glibc, you end up passing
    -D_GNU_SOURCE on command line, and doing so triggered warning...
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6616)

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

Summary of changes:
 crypto/rand/rand_unix.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index b64cf27..f482de0 100644
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c
@@ -7,7 +7,9 @@
  * https://www.openssl.org/source/license.html
  */
 
-#define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
 #include "e_os.h"
 #include <stdio.h>
 #include "internal/cryptlib.h"