From: Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Date: Mon, 30 Sep 2019 07:05:44 +0000 (+0200)
Subject: rand_unix.c: correct include guard comments
X-Git-Tag: OpenSSL_1_1_1e~178
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=10cb54d75b401f034ead4e59fe1e2fba166085d3;p=oweals%2Fopenssl.git

rand_unix.c: correct include guard comments

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10050)

(cherry picked from commit 2a7e6ed86be20bd472696a3eafe5d20ec9579dab)
---

diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c
index f88470d35f..58d47367ac 100644
--- a/crypto/rand/rand_unix.c
+++ b/crypto/rand/rand_unix.c
@@ -80,7 +80,8 @@ static uint64_t get_timer_bits(void);
 #   define OSSL_POSIX_TIMER_OKAY
 #  endif
 # endif
-#endif /* defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__) */
+#endif /* (defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_SYS_VXWORKS))
+          || defined(__DJGPP__) */
 
 #if defined(OPENSSL_RAND_SEED_NONE)
 /* none means none. this simplifies the following logic */
@@ -860,4 +861,5 @@ static uint64_t get_timer_bits(void)
 # endif
     return time(NULL);
 }
-#endif /* defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__) */
+#endif /* (defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_SYS_VXWORKS))
+          || defined(__DJGPP__) */