vbox的更動 6946 路徑 trunk/src/VBox/Runtime/r3/os2

時間撮記:

2008-2-14 下午12:59:57 (17 年 以前)

作者:

vboxsync

訊息:

Aligned the TLS destructor bits with posix.

檔案:

• trunk/src/VBox/Runtime/r3/os2/thread-os2.cpp (修改) (1 筆差異)

trunk/src/VBox/Runtime/r3/os2/thread-os2.cpp

@@ -279 +279 @@
 
 
-RTR3DECL(int) RTTlsSetDestructor(RTTLS iTls, PFNRTTLSDTOR pfnDestructor, uint32_t fFlags)
+RTR3DECL(int) RTTlsSetDestructor(RTTLS iTls, PFNRTTLSDTOR pfnDestructor)
 {
     AssertReturn(!fFlags, VERR_INVALID_PARAMETER)
-    if (__libc_TLSDestructor(iTls, pfnDestructor, fFlags) == -1)
-        return VINF_SUCCESS;
-    return RTErrConvertFromErrno(errno);
-}
-
-
-PFNRTTLSDTOR RTTlsGetDestructor(RTTLS iTls, PFNRTTLSDTOR *ppfnDestructor, uint32_t *pfFlags)
-{
-    uint32_t fFlags;
-    if (!pfFlags)
-        pfFlags = &fFlags;
+    if (__libc_TLSDestructor(iTls, (void (*)(void *, int, unsigned))pfnDestructor, fFlags) == -1)
+        return VINF_SUCCESS;
+    return RTErrConvertFromErrno(errno);
+}
+
+
+PFNRTTLSDTOR RTTlsGetDestructor(RTTLS iTls, PFNRTTLSDTOR *ppfnDestructor)
+{
+    unsigned fFlags;
     errno = 0;
-    *ppfnDestructor = __libc_TLSGetDestructor(iTls, pFlags);
+    *ppfnDestructor = (PFNRTTLSDTOR)__libc_TLSGetDestructor(iTls, &fFlags);
     if (!*ppfnDestructor && errno)
         return RTErrConvertFromErrno(errno);