diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-29 13:56:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-29 13:56:29 (GMT) |
| commit | 6eb04fb033b1c9677ea1cf98f885713ee94dede7 (patch) | |
| tree | 512310b1d25486fbc465e8b09b1ab2131c867003 | |
| parent | 9b5304eb3a0e69d76a593c818395cb4025ed8121 (diff) | |
| parent | 5b062d1806f1da051de058a1c426551933fb5952 (diff) | |
| download | tcl-6eb04fb033b1c9677ea1cf98f885713ee94dede7.zip tcl-6eb04fb033b1c9677ea1cf98f885713ee94dede7.tar.gz tcl-6eb04fb033b1c9677ea1cf98f885713ee94dede7.tar.bz2 | |
Merge 9.0
| -rw-r--r-- | generic/tclInt.h | 13 | ||||
| -rw-r--r-- | win/tclWinThrd.c | 2 |
2 files changed, 9 insertions, 6 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h index 8c6d5f0..01b2dae 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -115,21 +115,24 @@ typedef int ptrdiff_t; * to/from pointer from/to integer of different size". */ -#if !defined(INT2PTR) && !defined(PTR2INT) +#if !defined(INT2PTR) # if defined(HAVE_INTPTR_T) || defined(intptr_t) # define INT2PTR(p) ((void *)(intptr_t)(p)) -# define PTR2INT(p) ((intptr_t)(p)) # else # define INT2PTR(p) ((void *)(p)) +# endif +#endif +#if !defined(PTR2INT) +# if defined(HAVE_INTPTR_T) || defined(intptr_t) +# define PTR2INT(p) ((intptr_t)(p)) +# else # define PTR2INT(p) ((long)(p)) # endif #endif -#if !defined(UINT2PTR) && !defined(PTR2UINT) +#if !defined(PTR2UINT) # if defined(HAVE_UINTPTR_T) || defined(uintptr_t) -# define UINT2PTR(p) ((void *)(uintptr_t)(p)) # define PTR2UINT(p) ((uintptr_t)(p)) # else -# define UINT2PTR(p) ((void *)(p)) # define PTR2UINT(p) ((unsigned long)(p)) # endif #endif diff --git a/win/tclWinThrd.c b/win/tclWinThrd.c index 0bffe21..841a854 100644 --- a/win/tclWinThrd.c +++ b/win/tclWinThrd.c @@ -326,7 +326,7 @@ TclpThreadExit( Tcl_ThreadId Tcl_GetCurrentThread(void) { - return (Tcl_ThreadId)(size_t)GetCurrentThreadId(); + return (Tcl_ThreadId)INT2PTR(GetCurrentThreadId()); } /* |