Imported Upstream version 1.1.0

[platform/upstream/iotivity.git] / resource / c_common / ocrandom / src / ocrandom.c

diff --git a/resource/c_common/ocrandom/src/ocrandom.c b/resource/c_common/ocrandom/src/ocrandom.c
index ff09112..95472b6 100644 (file)
--- a/resource/c_common/ocrandom/src/ocrandom.c
+++ b/resource/c_common/ocrandom/src/ocrandom.c
@@ -37,6 +37,7 @@
 #include <sys/time.h>
 #include <time.h>
 #if defined(__ANDROID__)
+#include <ctype.h>
 #include <linux/time.h>
 #endif
 #endif
@@ -47,6 +48,10 @@
 #include <uuid/uuid.h>
 #endif
 
+#if !defined(__ANDROID__) || defined(__linux__) || defined(__APPLE__) || defined(__TIZEN__)
+#define NANO_SEC 1000000000
+#endif
+
 #ifdef ARDUINO
 #include "Arduino.h"
 
@@ -105,15 +110,15 @@ int8_t OCSeedRandom()
 #ifdef __ANDROID__
     struct timespec getTs;
     clock_gettime(CLOCK_MONOTONIC, &getTs);
-    currentTime = (getTs.tv_sec * (uint64_t)1000000000 + getTs.tv_nsec)/1000;
+    currentTime = (getTs.tv_sec * (uint64_t)NANO_SEC + getTs.tv_nsec)/1000;
 #elif  _POSIX_TIMERS > 0
     struct timespec ts;
     clock_gettime(CLOCK_MONOTONIC, &ts);
-    currentTime = ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
+    currentTime = (ts.tv_sec * (uint64_t)NANO_SEC + ts.tv_nsec)/ 1000;
 #else
     struct timeval tv;
     gettimeofday(&tv, NULL);
-    currentTime = tv.tv_sec * 1000000 + tv.tv_usec;
+    currentTime = tv.tv_sec * (uint64_t)1000000 + tv.tv_usec;
 #endif
 
     int32_t fd = open("/dev/urandom", O_RDONLY);