Skip to content

Commit cbd70d1

Browse files
Merge pull request #461 from tachoknight/master
Added underscores to gettid(void) to remove name clash
2 parents 9d485ca + 7f08ce4 commit cbd70d1

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/queue.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7300,21 +7300,21 @@ libdispatch_init(void)
73007300
#ifdef SYS_gettid
73017301
DISPATCH_ALWAYS_INLINE
73027302
static inline pid_t
7303-
gettid(void)
7303+
_gettid(void)
73047304
{
73057305
return (pid_t)syscall(SYS_gettid);
73067306
}
73077307
#elif defined(__FreeBSD__)
73087308
DISPATCH_ALWAYS_INLINE
73097309
static inline pid_t
7310-
gettid(void)
7310+
_gettid(void)
73117311
{
73127312
return (pid_t)pthread_getthreadid_np();
73137313
}
73147314
#elif defined(_WIN32)
73157315
DISPATCH_ALWAYS_INLINE
73167316
static inline DWORD
7317-
gettid(void)
7317+
_gettid(void)
73187318
{
73197319
return GetCurrentThreadId();
73207320
}
@@ -7429,7 +7429,7 @@ libdispatch_tsd_init(void)
74297429
#else
74307430
FlsSetValue(__dispatch_tsd_key, &__dispatch_tsd);
74317431
#endif // defined(_WIN32)
7432-
__dispatch_tsd.tid = gettid();
7432+
__dispatch_tsd.tid = _gettid();
74337433
}
74347434
#endif
74357435

0 commit comments

Comments
 (0)