diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 2000-02-29 06:01:22 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 2000-02-29 06:01:22 +0000 |
| commit | c44d3fdb45c0c48dcd8af6dc9f4a4166137bf839 (patch) | |
| tree | ec79e5cbf9765f15fbfee480090143a506a9000d /win32 | |
| parent | ba869debd80c55cfae8e9d4de0991d62f9efcb9b (diff) | |
| download | perl-c44d3fdb45c0c48dcd8af6dc9f4a4166137bf839.tar.gz | |
various shenanigans in change#5342
p4raw-link: @5342 on //depot/perl: ba869debd80c55cfae8e9d4de0991d62f9efcb9b
p4raw-id: //depot/perl@5343
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 7 | ||||
| -rw-r--r-- | win32/makefile.mk | 7 | ||||
| -rw-r--r-- | win32/win32.h | 2 | ||||
| -rw-r--r-- | win32/win32thread.h | 8 |
4 files changed, 10 insertions, 14 deletions
diff --git a/win32/Makefile b/win32/Makefile index 321d341ab7..27e597f738 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -535,11 +535,8 @@ EXTRACORE_SRC = $(EXTRACORE_SRC) ..\perlio.c WIN32_SRC = \ .\win32.c \ - .\win32sck.c - -!IF "$(USE_5005THREADS)" == "define" -WIN32_SRC = $(WIN32_SRC) .\win32thread.c -!ENDIF + .\win32sck.c \ + .\win32thread.c !IF "$(CRYPT_SRC)" != "" WIN32_SRC = $(WIN32_SRC) .\$(CRYPT_SRC) diff --git a/win32/makefile.mk b/win32/makefile.mk index c235e9dcf1..44b5b3a2d7 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -658,11 +658,8 @@ EXTRACORE_SRC += ..\perlio.c WIN32_SRC = \ .\win32.c \ - .\win32sck.c - -.IF "$(USE_5005THREADS)" == "define" -WIN32_SRC += .\win32thread.c -.ENDIF + .\win32sck.c \ + .\win32thread.c .IF "$(CRYPT_SRC)" != "" WIN32_SRC += .\$(CRYPT_SRC) diff --git a/win32/win32.h b/win32/win32.h index f102234b78..6f4c0d061e 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -158,6 +158,8 @@ struct utsname { # define F_OK 0 #endif +#define PERL_GET_CONTEXT_DEFINED + /* Compiler-specific stuff. */ #ifdef __BORLANDC__ /* Borland C++ */ diff --git a/win32/win32thread.h b/win32/win32thread.h index cfa13cc9f5..46c6bf5f84 100644 --- a/win32/win32thread.h +++ b/win32/win32thread.h @@ -168,8 +168,6 @@ extern __declspec(thread) void *PL_current_context; #define PERL_SET_CONTEXT(t) Perl_set_context(t) #endif -#define PERL_GET_CONTEXT_DEFINED - #if defined(USE_THREADS) struct perl_thread; int Perl_thread_create (struct perl_thread *thr, thread_func_t *fn); @@ -185,8 +183,10 @@ END_EXTERN_C #define INIT_THREADS NOOP #define ALLOC_THREAD_KEY \ STMT_START { \ - if ((PL_thr_key = TlsAlloc()) == TLS_OUT_OF_INDEXES) \ - Perl_croak_nocontext("panic: TlsAlloc"); \ + if ((PL_thr_key = TlsAlloc()) == TLS_OUT_OF_INDEXES) { \ + fprintf(stderr,"panic: TlsAlloc"); \ + exit(1); \ + } \ } STMT_END #if defined(USE_RTL_THREAD_API) && !defined(_MSC_VER) |