From 05d82ad147da7a5374cdbcb1d17e0ca6b8a72ed6 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Fri, 18 Mar 2016 22:13:23 +0100
Subject: [PATCH] Simplify quirks for C++Builder

---
 src/libsodium/randombytes/randombytes.c           |  3 +--
 .../salsa20/randombytes_salsa20_random.c          | 15 ++++-----------
 test/quirks/quirks.h                              |  3 +--
 3 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/libsodium/randombytes/randombytes.c b/src/libsodium/randombytes/randombytes.c
index 56739dd0..c01b87ff 100644
--- a/src/libsodium/randombytes/randombytes.c
+++ b/src/libsodium/randombytes/randombytes.c
@@ -17,9 +17,8 @@
 # include "randombytes_nativeclient.h"
 #endif
 
-#if defined(random)
+/* C++Builder defines a "random" macro */
 #undef random
-#endif
 
 #ifndef __EMSCRIPTEN__
 #ifdef __native_client__
diff --git a/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c b/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c
index 2f3341a9..94736996 100644
--- a/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c
+++ b/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c
@@ -36,6 +36,10 @@ extern "C"
 # endif
 BOOLEAN NTAPI RtlGenRandom(PVOID RandomBuffer, ULONG RandomBufferLength);
 # pragma comment(lib, "advapi32.lib")
+# ifdef __BORLANDC__
+#  define _ftime ftime
+#  define _timeb timeb
+# endif
 #endif
 
 #define SALSA20_RANDOM_BLOCK_SIZE crypto_core_salsa20_OUTPUTBYTES
@@ -77,21 +81,10 @@ sodium_hrtime(void)
 
 #ifdef _WIN32
     {
-#ifdef __BORLANDC__
-	struct timeb tb;
-#else
         struct _timeb tb;
-#endif
-
 # pragma warning(push)
 # pragma warning(disable: 4996)
-
-#ifdef __BORLANDC__
-	ftime(&tb);
-#else
         _ftime(&tb);
-#endif
-
 # pragma warning(pop)
         ts = ((uint64_t) tb.time) * 1000000U + ((uint64_t) tb.millitm) * 1000U;
     }
diff --git a/test/quirks/quirks.h b/test/quirks/quirks.h
index 83f5afd7..9f61acdf 100644
--- a/test/quirks/quirks.h
+++ b/test/quirks/quirks.h
@@ -1,9 +1,8 @@
 
 #include <stdlib.h>
 
-#if defined(random)
+/* C++Builder defines a "random" macro */
 #undef random
-#endif
 
 #ifdef __EMSCRIPTEN__
 # define strcmp(s1, s2) xstrcmp(s1, s2)