diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/config_H.bc | 2 | ||||
| -rw-r--r-- | win32/config_H.gc | 2 | ||||
| -rw-r--r-- | win32/config_H.vc | 2 | ||||
| -rw-r--r-- | win32/perllib.c | 2 | ||||
| -rw-r--r-- | win32/win32.h | 10 | ||||
| -rw-r--r-- | win32/win32sck.c | 6 | ||||
| -rw-r--r-- | win32/win32thread.c | 6 | ||||
| -rw-r--r-- | win32/win32thread.h | 4 |
8 files changed, 17 insertions, 17 deletions
diff --git a/win32/config_H.bc b/win32/config_H.bc index 57689b1d87..b35e4ac00a 100644 --- a/win32/config_H.bc +++ b/win32/config_H.bc @@ -3220,7 +3220,7 @@ /*#define USE_5005THREADS /**/ #define USE_ITHREADS /**/ #if defined(USE_5005THREADS) && !defined(USE_ITHREADS) -#define USE_THREADS /* until src is revised*/ +#define USE_5005THREADS /* until src is revised*/ #endif /*#define OLD_PTHREADS_API /**/ /*#define USE_REENTRANT_API /**/ diff --git a/win32/config_H.gc b/win32/config_H.gc index 0abfa62bf0..f06db24076 100644 --- a/win32/config_H.gc +++ b/win32/config_H.gc @@ -3220,7 +3220,7 @@ /*#define USE_5005THREADS /**/ #define USE_ITHREADS /**/ #if defined(USE_5005THREADS) && !defined(USE_ITHREADS) -#define USE_THREADS /* until src is revised*/ +#define USE_5005THREADS /* until src is revised*/ #endif /*#define OLD_PTHREADS_API /**/ /*#define USE_REENTRANT_API /**/ diff --git a/win32/config_H.vc b/win32/config_H.vc index 1834f7a628..deab1204bb 100644 --- a/win32/config_H.vc +++ b/win32/config_H.vc @@ -3220,7 +3220,7 @@ /*#define USE_5005THREADS /**/ #define USE_ITHREADS /**/ #if defined(USE_5005THREADS) && !defined(USE_ITHREADS) -#define USE_THREADS /* until src is revised*/ +#define USE_5005THREADS /* until src is revised*/ #endif /*#define OLD_PTHREADS_API /**/ /*#define USE_REENTRANT_API /**/ diff --git a/win32/perllib.c b/win32/perllib.c index fcf1bec884..2d5a87d141 100644 --- a/win32/perllib.c +++ b/win32/perllib.c @@ -377,7 +377,7 @@ DllMain(HANDLE hModule, /* DLL module handle */ PerlIO_cleanup() was done here but fails (B). */ EndSockets(); -#if defined(USE_THREADS) || defined(USE_ITHREADS) +#if defined(USE_5005THREADS) || defined(USE_ITHREADS) if (PL_curinterp) FREE_THREAD_KEY; #endif diff --git a/win32/win32.h b/win32/win32.h index 58c19c36ff..1350670690 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -402,11 +402,11 @@ struct thread_intern { # endif }; -#ifdef USE_THREADS +#ifdef USE_5005THREADS # ifndef USE_DECLSPEC_THREAD # define HAVE_THREAD_INTERN # endif /* !USE_DECLSPEC_THREAD */ -#endif /* USE_THREADS */ +#endif /* USE_5005THREADS */ #define HAVE_INTERP_INTERN typedef struct { @@ -426,7 +426,7 @@ struct interp_intern { child_tab * pseudo_children; #endif void * internal_host; -#ifndef USE_THREADS +#ifndef USE_5005THREADS struct thread_intern thr_intern; #endif }; @@ -446,7 +446,7 @@ struct interp_intern { #define w32_pseudo_child_pids (w32_pseudo_children->pids) #define w32_pseudo_child_handles (w32_pseudo_children->handles) #define w32_internal_host (PL_sys_intern.internal_host) -#ifdef USE_THREADS +#ifdef USE_5005THREADS # define w32_strerror_buffer (thr->i.Wstrerror_buffer) # define w32_getlogin_buffer (thr->i.Wgetlogin_buffer) # define w32_crypt_buffer (thr->i.Wcrypt_buffer) @@ -458,7 +458,7 @@ struct interp_intern { # define w32_crypt_buffer (PL_sys_intern.thr_intern.Wcrypt_buffer) # define w32_servent (PL_sys_intern.thr_intern.Wservent) # define w32_init_socktype (PL_sys_intern.thr_intern.Winit_socktype) -#endif /* USE_THREADS */ +#endif /* USE_5005THREADS */ /* UNICODE<>ANSI translation helpers */ /* Use CP_ACP when mode is ANSI */ diff --git a/win32/win32sck.c b/win32/win32sck.c index 3edeefd689..bdc335f4fc 100644 --- a/win32/win32sck.c +++ b/win32/win32sck.c @@ -40,7 +40,7 @@ # define TO_SOCKET(x) (x) #endif /* USE_SOCKETS_AS_HANDLES */ -#if defined(USE_THREADS) || defined(USE_ITHREADS) +#if defined(USE_5005THREADS) || defined(USE_ITHREADS) #define StartSockets() \ STMT_START { \ if (!wsock_started) \ @@ -105,7 +105,7 @@ void set_socktype(void) { #ifdef USE_SOCKETS_AS_HANDLES -#if defined(USE_THREADS) || defined(USE_ITHREADS) +#if defined(USE_5005THREADS) || defined(USE_ITHREADS) dTHXo; if (!w32_init_socktype) { #endif @@ -115,7 +115,7 @@ set_socktype(void) */ setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, (char *)&iSockOpt, sizeof(iSockOpt)); -#if defined(USE_THREADS) || defined(USE_ITHREADS) +#if defined(USE_5005THREADS) || defined(USE_ITHREADS) w32_init_socktype = 1; } #endif diff --git a/win32/win32thread.c b/win32/win32thread.c index 900f5fedff..6df2768c77 100644 --- a/win32/win32thread.c +++ b/win32/win32thread.c @@ -14,7 +14,7 @@ __declspec(thread) void *PL_current_context = NULL; void Perl_set_context(void *t) { -#if defined(USE_THREADS) || defined(USE_ITHREADS) +#if defined(USE_5005THREADS) || defined(USE_ITHREADS) # ifdef USE_DECLSPEC_THREAD Perl_current_context = t; # else @@ -28,7 +28,7 @@ Perl_set_context(void *t) void * Perl_get_context(void) { -#if defined(USE_THREADS) || defined(USE_ITHREADS) +#if defined(USE_5005THREADS) || defined(USE_ITHREADS) # ifdef USE_DECLSPEC_THREAD return Perl_current_context; # else @@ -42,7 +42,7 @@ Perl_get_context(void) #endif } -#ifdef USE_THREADS +#ifdef USE_5005THREADS void Perl_init_thread_intern(struct perl_thread *athr) { diff --git a/win32/win32thread.h b/win32/win32thread.h index 7105eca2e5..a86ea61f04 100644 --- a/win32/win32thread.h +++ b/win32/win32thread.h @@ -154,7 +154,7 @@ extern __declspec(thread) void *PL_current_context; #define PERL_SET_CONTEXT(t) Perl_set_context(t) #endif -#if defined(USE_THREADS) +#if defined(USE_5005THREADS) struct perl_thread; int Perl_thread_create (struct perl_thread *thr, thread_func_t *fn); void Perl_set_thread_self (struct perl_thread *thr); @@ -162,7 +162,7 @@ void Perl_init_thread_intern (struct perl_thread *t); #define SET_THREAD_SELF(thr) Perl_set_thread_self(thr) -#endif /* USE_THREADS */ +#endif /* USE_5005THREADS */ END_EXTERN_C |