diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-04-01 13:55:00 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-04-01 13:55:00 -0400 |
| commit | ce3979c721ba378a448bfbe3671c99d993cbc801 (patch) | |
| tree | e200d5225bcecef5f974b946a58277fddd24e89c /js/src/vm/Time.cpp | |
| parent | f6c16cff36048c583ca0e1d019b622336ca861a0 (diff) | |
| parent | ff2f287f82630ab3887d7d5c1e64e5b888ea0beb (diff) | |
| download | UXP-ce3979c721ba378a448bfbe3671c99d993cbc801.tar UXP-ce3979c721ba378a448bfbe3671c99d993cbc801.tar.gz UXP-ce3979c721ba378a448bfbe3671c99d993cbc801.tar.lz UXP-ce3979c721ba378a448bfbe3671c99d993cbc801.tar.xz UXP-ce3979c721ba378a448bfbe3671c99d993cbc801.zip | |
Merge branch 'master' into Sync-weave
Diffstat (limited to 'js/src/vm/Time.cpp')
| -rw-r--r-- | js/src/vm/Time.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/js/src/vm/Time.cpp b/js/src/vm/Time.cpp index 69e2cc41d..87531c148 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); } |