Simplify quirks for C++Builder

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__

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;
     }

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)