Merge branch 'master' of github.com:cyassl/cyassl

2012-08-15 17:00:34 -07:00
parent 05692e1d6a 198e48fa94
commit 925ddb6626
8 changed files with 140 additions and 29 deletions
--- a/ctaocrypt/src/random.c
+++ b/ctaocrypt/src/random.c
@@ -41,7 +41,9 @@
 #else
    #ifndef NO_DEV_RANDOM
        #include <fcntl.h>
-        #include <unistd.h>
+        #ifndef EBSNET
+            #include <unistd.h>
+        #endif
    #else
        /* include headers that may be needed to get good seed */
    #endif
@@ -101,7 +103,7 @@ int GenerateSeed(OS_Seed* os, byte* output, word32 sz)
 }


-#elif defined(THREADX)
+#elif defined(THREADX) || defined(EBSNET)

 #include "rtprand.h"   /* rtp_rand () */
 #include "rtptime.h"   /* rtp_get_system_msec() */