Author: labath Date: Mon Aug 8 07:40:11 2016 New Revision: 277999 URL: http://llvm.org/viewvc/llvm-project?rev=277999&view=rev Log: Remove SYS_tgkill from Android.h
instead, use __NR_tgkill directly, which seems to be the preferred form in the codebase anyway. Modified: lldb/trunk/include/lldb/Host/android/Android.h lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp lldb/trunk/source/Plugins/Process/Linux/NativeThreadLinux.cpp Modified: lldb/trunk/include/lldb/Host/android/Android.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Host/android/Android.h?rev=277999&r1=277998&r2=277999&view=diff ============================================================================== --- lldb/trunk/include/lldb/Host/android/Android.h (original) +++ lldb/trunk/include/lldb/Host/android/Android.h Mon Aug 8 07:40:11 2016 @@ -14,8 +14,6 @@ #include <string> #include <errno.h> -#define SYS_tgkill __NR_tgkill - namespace std { template <typename T> Modified: lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp?rev=277999&r1=277998&r2=277999&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp (original) +++ lldb/trunk/source/Plugins/Process/Linux/NativeProcessLinux.cpp Mon Aug 8 07:40:11 2016 @@ -60,7 +60,6 @@ #include "lldb/Host/linux/Personality.h" #include "lldb/Host/linux/Ptrace.h" #include "lldb/Host/linux/Uio.h" -#include "lldb/Host/android/Android.h" // Support hardware breakpoints in case it has not been defined #ifndef TRAP_HWBKPT Modified: lldb/trunk/source/Plugins/Process/Linux/NativeThreadLinux.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/NativeThreadLinux.cpp?rev=277999&r1=277998&r2=277999&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Linux/NativeThreadLinux.cpp (original) +++ lldb/trunk/source/Plugins/Process/Linux/NativeThreadLinux.cpp Mon Aug 8 07:40:11 2016 @@ -30,7 +30,7 @@ #include <sys/syscall.h> // Try to define a macro to encapsulate the tgkill syscall #define tgkill(pid, tid, sig) \ - syscall(SYS_tgkill, static_cast< ::pid_t>(pid), static_cast< ::pid_t>(tid), sig) + syscall(__NR_tgkill, static_cast< ::pid_t>(pid), static_cast< ::pid_t>(tid), sig) using namespace lldb; using namespace lldb_private; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits