Mark Wielaard 5f0c37
commit b46023d525b6e38a096ff4fdf9e6a96c7d7b7d40
Mark Wielaard 5f0c37
Author: Mark Wielaard <mark@klomp.org>
Mark Wielaard 5f0c37
Date:   Mon Mar 4 19:47:59 2019 +0100
Mark Wielaard 5f0c37
Mark Wielaard 5f0c37
    Rename gettid() to gettid_sys() in gdbserver_tests.
Mark Wielaard 5f0c37
    
Mark Wielaard 5f0c37
    glibc might defined gettid() itself through unistd.h:
Mark Wielaard 5f0c37
    https://sourceware.org/bugzilla/show_bug.cgi?id=6399
Mark Wielaard 5f0c37
    
Mark Wielaard 5f0c37
    Rename to gettid_sys() so we don't clash with the glibc definition.
Mark Wielaard 5f0c37
Mark Wielaard 5f0c37
diff --git a/gdbserver_tests/sleepers.c b/gdbserver_tests/sleepers.c
Mark Wielaard 5f0c37
index 5ffc6f8..dfda828 100644
Mark Wielaard 5f0c37
--- a/gdbserver_tests/sleepers.c
Mark Wielaard 5f0c37
+++ b/gdbserver_tests/sleepers.c
Mark Wielaard 5f0c37
@@ -15,7 +15,7 @@ static int sleepms = 1000; // in each loop, will sleep "sleepms" milliseconds
Mark Wielaard 5f0c37
 static int burn = 0; // after each sleep, will burn cpu in a tight 'burn' loop 
Mark Wielaard 5f0c37
 static void setup_sigusr_handler(void); // sigusr1 and 2 sigaction setup.
Mark Wielaard 5f0c37
 
Mark Wielaard 5f0c37
-static pid_t gettid()
Mark Wielaard 5f0c37
+static pid_t gettid_sys()
Mark Wielaard 5f0c37
 {
Mark Wielaard 5f0c37
 #ifdef __NR_gettid
Mark Wielaard 5f0c37
    return syscall(__NR_gettid);
Mark Wielaard 5f0c37
@@ -27,7 +27,7 @@ static pid_t gettid()
Mark Wielaard 5f0c37
 static void whoami(char *msg) __attribute__((unused));
Mark Wielaard 5f0c37
 static void whoami(char *msg)
Mark Wielaard 5f0c37
 {
Mark Wielaard 5f0c37
-   fprintf(stderr, "pid %ld Thread %ld %s\n", (long) getpid(), (long) gettid(),
Mark Wielaard 5f0c37
+   fprintf(stderr, "pid %ld Thread %ld %s\n", (long) getpid(), (long) gettid_sys(),
Mark Wielaard 5f0c37
            msg);
Mark Wielaard 5f0c37
    fflush(stderr);
Mark Wielaard 5f0c37
 }
Mark Wielaard 5f0c37
diff --git a/gdbserver_tests/t.c b/gdbserver_tests/t.c
Mark Wielaard 5f0c37
index 228d4a4..b3e7a28 100644
Mark Wielaard 5f0c37
--- a/gdbserver_tests/t.c
Mark Wielaard 5f0c37
+++ b/gdbserver_tests/t.c
Mark Wielaard 5f0c37
@@ -16,7 +16,7 @@ static int loopmain, loopt1, loopt2;
Mark Wielaard 5f0c37
 
Mark Wielaard 5f0c37
 static double pi = 3.14159265358979323846264338327950288;
Mark Wielaard 5f0c37
 
Mark Wielaard 5f0c37
-static pid_t gettid()
Mark Wielaard 5f0c37
+static pid_t gettid_sys()
Mark Wielaard 5f0c37
 {
Mark Wielaard 5f0c37
 #ifdef __NT_gettid
Mark Wielaard 5f0c37
    return syscall(__NR_gettid);
Mark Wielaard 5f0c37
@@ -26,7 +26,7 @@ static pid_t gettid()
Mark Wielaard 5f0c37
 }
Mark Wielaard 5f0c37
 static void whoami(char *msg)
Mark Wielaard 5f0c37
 {
Mark Wielaard 5f0c37
-   printf("pid %ld Thread %ld %s\n", (long) getpid(), (long) gettid(), msg);
Mark Wielaard 5f0c37
+   printf("pid %ld Thread %ld %s\n", (long) getpid(), (long) gettid_sys(), msg);
Mark Wielaard 5f0c37
    fflush(stdout);
Mark Wielaard 5f0c37
 }
Mark Wielaard 5f0c37