diff options
| author | Nick Ing-Simmons <nik@tiuk.ti.com> | 2002-03-17 09:12:39 +0000 |
|---|---|---|
| committer | Nick Ing-Simmons <nik@tiuk.ti.com> | 2002-03-17 09:12:39 +0000 |
| commit | e417e6d439d9f03a0c6005bc25522b721fd5ec92 (patch) | |
| tree | 307ec9967e5e74de08e4e451ca73c264746b638c /perl.h | |
| parent | a6a3912c27ed4f9ffb87d242b56d42a194c8b333 (diff) | |
| parent | c04a4dfec532b91f76755cfa4d008128d04c69cb (diff) | |
| download | perl-e417e6d439d9f03a0c6005bc25522b721fd5ec92.tar.gz | |
Integarate mainline
p4raw-id: //depot/perlio@15269
Diffstat (limited to 'perl.h')
| -rw-r--r-- | perl.h | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -77,6 +77,12 @@ # endif #endif +/* Use the reentrant APIs like localtime_r and getpwent_r */ +/* Win32 has naturally threadsafe libraries, no need to use any _r variants. */ +#if defined(USE_ITHREADS) && !defined(USE_REENTRANT_API) && !defined(WIN32) && !defined(__APPLE__) +# define USE_REENTRANT_API +#endif + /* <--- here ends the logic shared by perl.h and makedef.pl */ #ifdef PERL_IMPLICIT_CONTEXT @@ -338,12 +344,6 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER)); # endif #endif -/* Use the reentrant APIs like localtime_r and getpwent_r */ -/* Win32 has naturally threadsafe libraries, no need to use any _r variants. */ -#if defined(USE_ITHREADS) && !defined(USE_REENTRANT_API) && !defined(WIN32) && !defined(__APPLE__) -# define USE_REENTRANT_API -#endif - /* HP-UX 10.X CMA (Common Multithreaded Architecure) insists that pthread.h must be included before all other header files. */ @@ -2694,7 +2694,9 @@ END_EXTERN_C char *crypt (); /* Maybe more hosts will need the unprototyped version */ # else # if !defined(WIN32) && !defined(VMS) +#ifndef crypt char *crypt (const char*, const char*); +#endif # endif /* !WIN32 */ # endif /* !NeXT && !__NeXT__ */ # ifndef DONT_DECLARE_STD @@ -2709,7 +2711,9 @@ Off_t lseek (int,Off_t,int); # endif # endif # endif /* !DONT_DECLARE_STD */ +#ifndef getlogin char *getlogin (void); +#endif #endif /* !__cplusplus */ #ifdef UNLINK_ALL_VERSIONS /* Currently only makes sense for VMS */ |