summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-10-16 12:37:07 -0400
committerMatt A. Tobin <email@mattatobin.com>2019-10-16 12:37:07 -0400
commite31d79e8da99456247df84c2f99ba9083d46efe1 (patch)
treea01ca91bfc9d886d34f5e223dc7bb56b28ba7743
parent3ae8f139af5e46157d0d9d5790d401c95e076988 (diff)
downloadUXP-e31d79e8da99456247df84c2f99ba9083d46efe1.tar
UXP-e31d79e8da99456247df84c2f99ba9083d46efe1.tar.gz
UXP-e31d79e8da99456247df84c2f99ba9083d46efe1.tar.lz
UXP-e31d79e8da99456247df84c2f99ba9083d46efe1.tar.xz
UXP-e31d79e8da99456247df84c2f99ba9083d46efe1.zip
Fix build errors with newer glibc versions
-rw-r--r--js/src/jsnativestack.cpp6
-rw-r--r--tools/profiler/tasktracer/GeckoTaskTracer.cpp12
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();