Merge pull request #373 from jcolli44/master

Introduce C++Builder compatibility

src/libsodium/randombytes/randombytes.c

@@ -17,6 +17,10 @@
 # include "randombytes_nativeclient.h"
 #endif
 
+#if defined(random)
+#undef random
+#endif
+
 #ifndef __EMSCRIPTEN__
 #ifdef __native_client__
 static const randombytes_implementation *implementation =

src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c

@@ -16,7 +16,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#ifndef _MSC_VER
+#if !defined(_MSC_VER) && !defined(__BORLANDC__)
 # include <unistd.h>
 #endif
 
@@ -77,10 +77,21 @@ 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,6 +1,10 @@
 
 #include <stdlib.h>
 
+#if defined(random)
+#undef random
+#endif
+
 #ifdef __EMSCRIPTEN__
 # define strcmp(s1, s2) xstrcmp(s1, s2)