Added underscores to gettid(void) to remove name clash with system-provided gettid() in /usr/include/bits/unistd_ext.h that is not static

tachoknight · rokhinip · commit 2fc6b18d1f2d · 2021-11-05T16:32:58.000-07:00
Signed-off-by: Kim Topley &lt;ktopley@apple.com&gt;
diff --git a/src/queue.c b/src/queue.c
@@ -7236,21 +7236,21 @@ libdispatch_init(void)
 #ifdef SYS_gettid
 DISPATCH_ALWAYS_INLINE
 static inline pid_t
-gettid(void)
+__gettid(void)
 {
 	return (pid_t)syscall(SYS_gettid);
 }
 #elif defined(__FreeBSD__)
 DISPATCH_ALWAYS_INLINE
 static inline pid_t
-gettid(void)
+__gettid(void)
 {
 	return (pid_t)pthread_getthreadid_np();
 }
 #elif defined(_WIN32)
 DISPATCH_ALWAYS_INLINE
 static inline DWORD
-gettid(void)
+__gettid(void)
 {
 	return GetCurrentThreadId();
 }
@@ -7365,7 +7365,7 @@ libdispatch_tsd_init(void)
 #else
 	FlsSetValue(__dispatch_tsd_key, &__dispatch_tsd);
 #endif // defined(_WIN32)
-	__dispatch_tsd.tid = gettid();
+	__dispatch_tsd.tid = __gettid();
 }
 
 DISPATCH_NOTHROW
diff --git a/src/unifdef.oD6HOK b/src/unifdef.oD6HOK
@@ -7843,21 +7843,21 @@ libdispatch_init(void)
 #ifdef SYS_gettid
 DISPATCH_ALWAYS_INLINE
 static inline pid_t
-gettid(void)
+__gettid(void)
 {
 	return (pid_t)syscall(SYS_gettid);
 }
 #elif defined(__FreeBSD__)
 DISPATCH_ALWAYS_INLINE
 static inline pid_t
-gettid(void)
+__gettid(void)
 {
 	return (pid_t)pthread_getthreadid_np();
 }
 #elif defined(_WIN32)
 DISPATCH_ALWAYS_INLINE
 static inline DWORD
-gettid(void)
+__gettid(void)
 {
 	return GetCurrentThreadId();
 }
@@ -7972,7 +7972,7 @@ libdispatch_tsd_init(void)
 #else
 	FlsSetValue(__dispatch_tsd_key, &__dispatch_tsd);
 #endif // defined(_WIN32)
-	__dispatch_tsd.tid = gettid();
+	__dispatch_tsd.tid = __gettid();
 }
 
 DISPATCH_NOTHROW

Original file line number	Diff line number	Diff line change
`@@ -7236,21 +7236,21 @@ libdispatch_init(void)`
`7236`	`7236`	`#ifdef SYS_gettid`
`7237`	`7237`	`DISPATCH_ALWAYS_INLINE`
`7238`	`7238`	`static inline pid_t`
`7239`		`-gettid(void)`
	`7239`	`+__gettid(void)`
`7240`	`7240`	`{`
`7241`	`7241`	`return (pid_t)syscall(SYS_gettid);`
`7242`	`7242`	`}`
`7243`	`7243`	`#elif defined(__FreeBSD__)`
`7244`	`7244`	`DISPATCH_ALWAYS_INLINE`
`7245`	`7245`	`static inline pid_t`
`7246`		`-gettid(void)`
	`7246`	`+__gettid(void)`
`7247`	`7247`	`{`
`7248`	`7248`	`return (pid_t)pthread_getthreadid_np();`
`7249`	`7249`	`}`
`7250`	`7250`	`#elif defined(_WIN32)`
`7251`	`7251`	`DISPATCH_ALWAYS_INLINE`
`7252`	`7252`	`static inline DWORD`
`7253`		`-gettid(void)`
	`7253`	`+__gettid(void)`
`7254`	`7254`	`{`
`7255`	`7255`	`return GetCurrentThreadId();`
`7256`	`7256`	`}`
`@@ -7365,7 +7365,7 @@ libdispatch_tsd_init(void)`
`7365`	`7365`	`#else`
`7366`	`7366`	`FlsSetValue(__dispatch_tsd_key, &__dispatch_tsd);`
`7367`	`7367`	`#endif // defined(_WIN32)`
`7368`		`- __dispatch_tsd.tid = gettid();`
	`7368`	`+ __dispatch_tsd.tid = __gettid();`
`7369`	`7369`	`}`
`7370`	`7370`
`7371`	`7371`	`DISPATCH_NOTHROW`
Original file line number	Diff line number	Diff line change
`@@ -7843,21 +7843,21 @@ libdispatch_init(void)`
`7843`	`7843`	`#ifdef SYS_gettid`
`7844`	`7844`	`DISPATCH_ALWAYS_INLINE`
`7845`	`7845`	`static inline pid_t`
`7846`		`-gettid(void)`
	`7846`	`+__gettid(void)`
`7847`	`7847`	`{`
`7848`	`7848`	`return (pid_t)syscall(SYS_gettid);`
`7849`	`7849`	`}`
`7850`	`7850`	`#elif defined(__FreeBSD__)`
`7851`	`7851`	`DISPATCH_ALWAYS_INLINE`
`7852`	`7852`	`static inline pid_t`
`7853`		`-gettid(void)`
	`7853`	`+__gettid(void)`
`7854`	`7854`	`{`
`7855`	`7855`	`return (pid_t)pthread_getthreadid_np();`
`7856`	`7856`	`}`
`7857`	`7857`	`#elif defined(_WIN32)`
`7858`	`7858`	`DISPATCH_ALWAYS_INLINE`
`7859`	`7859`	`static inline DWORD`
`7860`		`-gettid(void)`
	`7860`	`+__gettid(void)`
`7861`	`7861`	`{`
`7862`	`7862`	`return GetCurrentThreadId();`
`7863`	`7863`	`}`
`@@ -7972,7 +7972,7 @@ libdispatch_tsd_init(void)`
`7972`	`7972`	`#else`
`7973`	`7973`	`FlsSetValue(__dispatch_tsd_key, &__dispatch_tsd);`
`7974`	`7974`	`#endif // defined(_WIN32)`
`7975`		`- __dispatch_tsd.tid = gettid();`
	`7975`	`+ __dispatch_tsd.tid = __gettid();`
`7976`	`7976`	`}`
`7977`	`7977`
`7978`	`7978`	`DISPATCH_NOTHROW`