diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-10-16 12:37:07 -0400 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-10-21 10:34:15 +0200 |
| commit | 4f038bf39a4806ec7339bf062a184e4e1f20758e (patch) | |
| tree | 712deb09c660e2719ae7e6630e14fbb1886bde3f | |
| parent | 0d6f1e11ba26646c21eff61dcee78d17914bfd81 (diff) | |
| download | UXP-4f038bf39a4806ec7339bf062a184e4e1f20758e.tar UXP-4f038bf39a4806ec7339bf062a184e4e1f20758e.tar.gz UXP-4f038bf39a4806ec7339bf062a184e4e1f20758e.tar.lz UXP-4f038bf39a4806ec7339bf062a184e4e1f20758e.tar.xz UXP-4f038bf39a4806ec7339bf062a184e4e1f20758e.zip | |
Fix build errors with newer glibc versions
| -rw-r--r-- | js/src/jsnativestack.cpp | 6 | ||||
| -rw-r--r-- | tools/profiler/tasktracer/GeckoTaskTracer.cpp | 12 |
2 files changed, 4 insertions, 14 deletions
diff --git a/js/src/jsnativestack.cpp b/js/src/jsnativestack.cpp index 98f8fc741..94a296bd0 100644 --- a/js/src/jsnativestack.cpp +++ b/js/src/jsnativestack.cpp @@ -26,11 +26,7 @@ # include <sys/syscall.h> # include <sys/types.h> # include <unistd.h> -static pid_t -gettid() -{ - return syscall(__NR_gettid); -} +# define gettid() static_cast<pid_t>(syscall(SYS_gettid)) # endif #else diff --git a/tools/profiler/tasktracer/GeckoTaskTracer.cpp b/tools/profiler/tasktracer/GeckoTaskTracer.cpp index ada695614..36d1bffc3 100644 --- a/tools/profiler/tasktracer/GeckoTaskTracer.cpp +++ b/tools/profiler/tasktracer/GeckoTaskTracer.cpp @@ -20,22 +20,16 @@ #include <stdarg.h> -// We need a definition of gettid(), but glibc doesn't provide a +// We need a definition of gettid(), but older glibc versions don't provide a // wrapper for it. #if defined(__GLIBC__) #include <unistd.h> #include <sys/syscall.h> -static inline pid_t gettid() -{ - return (pid_t) syscall(SYS_gettid); -} +#define gettid() static_cast<pid_t>(syscall(SYS_gettid)) #elif defined(XP_MACOSX) #include <unistd.h> #include <sys/syscall.h> -static inline pid_t gettid() -{ - return (pid_t) syscall(SYS_thread_selfid); -} +#define gettid() static_cast<pid_t>(syscall(SYS_thread_selfid)) #elif defined(LINUX) #include <sys/types.h> pid_t gettid(); |