summaryrefslogtreecommitdiff
path: root/js/src/vm/Time.cpp
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-03-30 19:10:17 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-03-30 19:10:17 +0100
commit25779d371c571e4f51792af3e3c5588b3186e934 (patch)
tree5399f1a5456fb395b3780bfce49b4b170bd634b8 /js/src/vm/Time.cpp
parent60d420b0ad6dc722b62b5c2948c865e2e61b8212 (diff)
downloaduxp-25779d371c571e4f51792af3e3c5588b3186e934.tar.gz
Issue #187: Remove solaris conditional code.
Diffstat (limited to 'js/src/vm/Time.cpp')
-rw-r--r--js/src/vm/Time.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/js/src/vm/Time.cpp b/js/src/vm/Time.cpp
index 69e2cc41d2..87531c1483 100644
--- a/js/src/vm/Time.cpp
+++ b/js/src/vm/Time.cpp
@@ -11,9 +11,6 @@
#include "mozilla/DebugOnly.h"
#include "mozilla/MathAlgorithms.h"
-#ifdef SOLARIS
-#define _REENTRANT 1
-#endif
#include <string.h>
#include <time.h>
@@ -33,10 +30,6 @@
#ifdef XP_UNIX
-#ifdef _SVID_GETTOD /* Defined only on Solaris, see Solaris <sys/types.h> */
-extern int gettimeofday(struct timeval* tv);
-#endif
-
#include <sys/time.h>
#endif /* XP_UNIX */
@@ -49,11 +42,7 @@ PRMJ_Now()
{
struct timeval tv;
-#ifdef _SVID_GETTOD /* Defined only on Solaris, see Solaris <sys/types.h> */
- gettimeofday(&tv);
-#else
gettimeofday(&tv, 0);
-#endif /* _SVID_GETTOD */
return int64_t(tv.tv_sec) * PRMJ_USEC_PER_SEC + int64_t(tv.tv_usec);
}