X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl.h;h=8f1cad367ef8c6e388023f7a70766b846fe63125;hb=40b7a5f5e789eb31046d021a15e48b502ad8e1e9;hp=8a17159c85f88242d0bab5ee609ce3fe55574817;hpb=db42d1485c38c3442e7b62e63d45f5e5b9b66ee1;p=p5sagit%2Fp5-mst-13.2.git diff --git a/perl.h b/perl.h index 8a17159..8f1cad3 100644 --- a/perl.h +++ b/perl.h @@ -225,8 +225,20 @@ struct perl_thread; # define CALLPROTECT CALL_FPTR(PL_protect) #endif +#ifdef HASATTRIBUTE +# define PERL_UNUSED_DECL __attribute__((unused)) +#else +# define PERL_UNUSED_DECL +#endif + +/* gcc -Wall: + * for silencing unused variables that are actually used most of the time, + * but we cannot quite get rid of, such `ax' in PPCODE+noargs xsubs + */ +#define PERL_UNUSED_VAR(var) if (0) var = var + #define NOOP (void)0 -#define dNOOP extern int Perl___notused +#define dNOOP extern int Perl___notused PERL_UNUSED_DECL #ifndef pTHX # define pTHX void @@ -258,6 +270,15 @@ struct perl_thread; # define dTHXx dTHX #endif +/* Under PERL_IMPLICIT_SYS (used in Windows for fork emulation) + * PerlIO_foo() expands to PL_StdIO->pFOO(PL_StdIO, ...). + * dTHXs is therefore needed for all functions using PerlIO_foo(). */ +#ifdef PERL_IMPLICIT_SYS +# define dTHXs dTHX +#else +# define dTHXs dNOOP +#endif + #undef START_EXTERN_C #undef END_EXTERN_C #undef EXTERN_C @@ -339,15 +360,15 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER)); */ /* define this once if either system, instead of cluttering up the src */ -#if defined(MSDOS) || defined(atarist) || defined(WIN32) +#if defined(MSDOS) || defined(atarist) || defined(WIN32) || defined(NETWARE) #define DOSISH 1 #endif -#if defined(__STDC__) || defined(vax11c) || defined(_AIX) || defined(__stdc__) || defined(__cplusplus) || defined( EPOC) +#if defined(__STDC__) || defined(vax11c) || defined(_AIX) || defined(__stdc__) || defined(__cplusplus) || defined( EPOC) || defined(NETWARE) # define STANDARD_C 1 #endif -#if defined(__cplusplus) || defined(WIN32) || defined(__sgi) || defined(OS2) || defined(__DGUX) || defined( EPOC) || defined(__QNX__) +#if defined(__cplusplus) || defined(WIN32) || defined(__sgi) || defined(OS2) || defined(__DGUX) || defined( EPOC) || defined(__QNX__) || defined(NETWARE) # define DONT_DECLARE_STD 1 #endif @@ -506,6 +527,14 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER)); # include #endif +#if defined(HAS_SYSCALL) && !defined(HAS_SYSCALL_PROTO) +int syscall(int, ...); +#endif + +#if defined(HAS_USLEEP) && !defined(HAS_USLEEP_PROTO) +int usleep(unsigned int); +#endif + #ifdef PERL_MICRO /* Last chance to export Perl_my_swap */ # define MYSWAP #endif @@ -718,6 +747,11 @@ typedef struct perl_mstats perl_mstats_t; # define WIN32SCK_IS_STDSCK /* don't pull in custom wsock layer */ #endif +/* In Tru64 use the 4.4BSD struct msghdr, not the 4.3 one */ +#if defined(__osf__) && defined(__alpha) && !defined(_SOCKADDR_LEN) +# define _SOCKADDR_LEN +#endif + #if defined(HAS_SOCKET) && !defined(VMS) /* VMS handles sockets via vmsish.h */ # include # if defined(USE_SOCKS) && defined(I_SOCKS) @@ -743,6 +777,9 @@ typedef struct perl_mstats perl_mstats_t; # endif # endif # ifdef I_NETDB +# ifdef NETWARE +# include +# endif # include # endif # ifndef ENOTSOCK @@ -752,6 +789,12 @@ typedef struct perl_mstats perl_mstats_t; # endif #endif +/* sockatmark() is so new (2001) that many places might have it hidden + * behind some -D_BLAH_BLAH_SOURCE guard. */ +#if defined(HAS_SOCKATMARK) && !defined(HAS_SOCKATMARK_PROTO) +int sockatmark(int); +#endif + #ifdef SETERRNO # undef SETERRNO /* SOCKS might have defined this */ #endif @@ -1023,6 +1066,13 @@ typedef struct perl_mstats perl_mstats_t; #undef UV #endif +/* Configure gets this right but the UTS compiler gets it wrong. + -- Hal Morris */ +#ifdef UTS +# undef UVTYPE +# define UVTYPE unsigned +#endif + /* The IV type is supposed to be long enough to hold any integral value or a pointer. @@ -1081,6 +1131,11 @@ typedef UVTYPE UV; # endif #endif +#if defined(uts) || defined(UTS) +# undef UV_MAX +# define UV_MAX (4294967295u) +#endif + #define IV_DIG (BIT_DIGITS(IVSIZE * 8)) #define UV_DIG (BIT_DIGITS(UVSIZE * 8)) @@ -1280,24 +1335,8 @@ typedef NVTYPE NV; # endif #endif -#if !defined(Perl_atof) && defined(USE_LONG_DOUBLE) && defined(HAS_LONG_DOUBLE) -# if !defined(Perl_atof) && defined(HAS_STRTOLD) -# define Perl_atof(s) (NV)strtold(s, (char**)NULL) -# endif -# if !defined(Perl_atof) && defined(HAS_ATOLF) -# define Perl_atof (NV)atolf -# endif -# if !defined(Perl_atof) && defined(PERL_SCNfldbl) -# define Perl_atof PERL_SCNfldbl -# define Perl_atof2(s,f) sscanf((s), "%"PERL_SCNfldbl, &(f)) -# endif -#endif -#if !defined(Perl_atof) -# define Perl_atof atof /* we assume atof being available anywhere */ -#endif -#if !defined(Perl_atof2) -# define Perl_atof2(s,f) ((f) = (NV)Perl_atof(s)) -#endif +#define Perl_atof(s) Perl_my_atof(s) +#define Perl_atof2(s, np) Perl_my_atof2(s, np) /* Previously these definitions used hardcoded figures. * It is hoped these formula are more portable, although @@ -1699,6 +1738,22 @@ typedef struct ptr_tbl PTR_TBL_t; # define NEED_ENVIRON_DUP_FOR_MODIFY #endif +/* + * initialise to avoid floating-point exceptions from overflow, etc + */ +#ifndef PERL_FPU_INIT +# ifdef HAS_FPSETMASK +# if HAS_FLOATINGPOINT_H +# include +# endif +# define PERL_FPU_INIT fpsetmask(0); +# elif PERL_IGNORE_FPUSIG +# define PERL_FPU_INIT signal(PERL_IGNORE_FPUSIG, SIG_IGN); +# else +# define PERL_FPU_INIT +# endif +#endif + #ifndef PERL_SYS_INIT3 # define PERL_SYS_INIT3(argvp,argcp,envp) PERL_SYS_INIT(argvp,argcp) #endif @@ -1738,6 +1793,9 @@ typedef struct ptr_tbl PTR_TBL_t; * atomic.h everywhere */ # define EMULATE_ATOMIC_REFCOUNTS # endif +# ifdef NETWARE +# include +# else # ifdef FAKE_THREADS # include "fakethr.h" # else @@ -1768,12 +1826,17 @@ typedef pthread_key_t perl_key; # endif /* OS2 */ # endif /* WIN32 */ # endif /* FAKE_THREADS */ +#endif /* NETWARE */ #endif /* USE_THREADS || USE_ITHREADS */ #ifdef WIN32 # include "win32.h" #endif +#ifdef NETWARE +# include "netware.h" +#endif + #ifdef VMS # define STATUS_NATIVE PL_statusvalue_vms # define STATUS_NATIVE_EXPORT \ @@ -1837,10 +1900,12 @@ typedef pthread_key_t perl_key; #endif /* This defines a way to flush all output buffers. This may be a - * performance issue, so we allow people to disable it. + * performance issue, so we allow people to disable it. Also, if + * we are using stdio, there are broken implementations of fflush(NULL) + * out there, Solaris being the most prominent. */ #ifndef PERL_FLUSHALL_FOR_CHILD -# if defined(FFLUSH_NULL) || defined(USE_SFIO) +# if defined(USE_PERLIO) || defined(FFLUSH_NULL) || defined(USE_SFIO) # define PERL_FLUSHALL_FOR_CHILD PerlIO_flush((PerlIO*)NULL) # else # ifdef FFLUSH_ALL @@ -2079,25 +2144,52 @@ struct ptr_tbl { /* otherwise default to functions in util.c */ #endif -#ifdef CASTNEGFLOAT -#define U_S(what) ((U16)(what)) -#define U_I(what) ((unsigned int)(what)) -#define U_L(what) ((U32)(what)) -#else -#define U_S(what) ((U16)cast_ulong((NV)(what))) -#define U_I(what) ((unsigned int)cast_ulong((NV)(what))) -#define U_L(what) (cast_ulong((NV)(what))) -#endif +/* *MAX Plus 1. A floating point value. + Hopefully expressed in a way that dodgy floating point can't mess up. + >> 2 rather than 1, so that value is safely less than I32_MAX after 1 + is added to it + May find that some broken compiler will want the value cast to I32. + [after the shift, as signed >> may not be as secure as unsigned >>] +*/ +#define I32_MAX_P1 (2.0 * (1 + (((U32)I32_MAX) >> 1))) +#define U32_MAX_P1 (4.0 * (1 + ((U32_MAX) >> 2))) +/* For compilers that can't correctly cast NVs over 0x7FFFFFFF (or + 0x7FFFFFFFFFFFFFFF) to an unsigned integer. In the future, sizeof(UV) + may be greater than sizeof(IV), so don't assume that half max UV is max IV. +*/ +#define U32_MAX_P1_HALF (2.0 * (1 + ((U32_MAX) >> 2))) -#ifdef CASTI32 -#define I_32(what) ((I32)(what)) -#define I_V(what) ((IV)(what)) -#define U_V(what) ((UV)(what)) -#else +#define UV_MAX_P1 (4.0 * (1 + ((UV_MAX) >> 2))) +#define IV_MAX_P1 (2.0 * (1 + (((UV)IV_MAX) >> 1))) +#define UV_MAX_P1_HALF (2.0 * (1 + ((UV_MAX) >> 2))) + +/* This may look like unnecessary jumping through hoops, but converting + out of range floating point values to integers *is* undefined behaviour, + and it is starting to bite. +*/ +#ifndef CAST_INLINE #define I_32(what) (cast_i32((NV)(what))) +#define U_32(what) (cast_ulong((NV)(what))) #define I_V(what) (cast_iv((NV)(what))) #define U_V(what) (cast_uv((NV)(what))) -#endif +#else +#define I_32(n) ((n) < I32_MAX_P1 ? ((n) < I32_MIN ? I32_MIN : (I32) (n)) \ + : ((n) < U32_MAX_P1 ? (I32)(U32) (n) \ + : ((n) > 0 ? (I32) U32_MAX : 0 /* NaN */))) +#define U_32(n) ((n) < 0.0 ? ((n) < I32_MIN ? (UV) I32_MIN : (U32)(I32) (n)) \ + : ((n) < U32_MAX_P1 ? (U32) (n) \ + : ((n) > 0 ? U32_MAX : 0 /* NaN */))) +#define I_V(n) ((n) < IV_MAX_P1 ? ((n) < IV_MIN ? IV_MIN : (IV) (n)) \ + : ((n) < UV_MAX_P1 ? (IV)(UV) (n) \ + : ((n) > 0 ? (IV)UV_MAX : 0 /* NaN */))) +#define U_V(n) ((n) < 0.0 ? ((n) < IV_MIN ? (UV) IV_MIN : (UV)(IV) (n)) \ + : ((n) < UV_MAX_P1 ? (UV) (n) \ + : ((n) > 0 ? UV_MAX : 0 /* NaN */))) +#endif + +#define U_S(what) ((U16)U_32(what)) +#define U_I(what) ((unsigned int)U_32(what)) +#define U_L(what) U_32(what) /* These do not care about the fractional part, only about the range. */ #define NV_WITHIN_IV(nv) (I_V(nv) >= IV_MIN && I_V(nv) <= IV_MAX) @@ -2203,23 +2295,28 @@ Gid_t getegid (void); } STMT_END # endif -# define DEBUG_f(a) if (DEBUG_f_TEST) a -# define DEBUG_r(a) if (DEBUG_r_TEST) a -# define DEBUG_x(a) if (DEBUG_x_TEST) a -# define DEBUG_u(a) if (DEBUG_u_TEST) a -# define DEBUG_L(a) if (DEBUG_L_TEST) a -# define DEBUG_H(a) if (DEBUG_H_TEST) a -# define DEBUG_X(a) if (DEBUG_X_TEST) a -# define DEBUG_D(a) if (DEBUG_D_TEST) a +# define DEBUG__(t, a) \ + STMT_START { \ + if (t) STMT_START {a;} STMT_END; \ + } STMT_END + +# define DEBUG_f(a) DEBUG__(DEBUG_f_TEST, a) +# define DEBUG_r(a) DEBUG__(DEBUG_r_TEST, a) +# define DEBUG_x(a) DEBUG__(DEBUG_x_TEST, a) +# define DEBUG_u(a) DEBUG__(DEBUG_u_TEST, a) +# define DEBUG_L(a) DEBUG__(DEBUG_L_TEST, a) +# define DEBUG_H(a) DEBUG__(DEBUG_H_TEST, a) +# define DEBUG_X(a) DEBUG__(DEBUG_X_TEST, a) +# define DEBUG_D(a) DEBUG__(DEBUG_D_TEST, a) # ifdef USE_THREADS -# define DEBUG_S(a) if (DEBUG_S_TEST) a +# define DEBUG_S(a) DEBUG__(DEBUG_S_TEST, a) # else # define DEBUG_S(a) # endif -# define DEBUG_T(a) if (DEBUG_T_TEST) a -# define DEBUG_R(a) if (DEBUG_R_TEST) a +# define DEBUG_T(a) DEBUG__(DEBUG_T_TEST, a) +# define DEBUG_R(a) DEBUG__(DEBUG_R_TEST, a) #else /* DEBUGGING */ @@ -2267,6 +2364,52 @@ Gid_t getegid (void); #endif /* DEBUGGING */ +/* These constants should be used in preference to to raw characters + * when using magic. Note that some perl guts still assume + * certain character properties of these constants, namely that + * isUPPER() and toLOWER() may do useful mappings. + * + * Update the magic_names table in dump.c when adding/amending these + */ + +#define PERL_MAGIC_sv '\0' /* Special scalar variable */ +#define PERL_MAGIC_overload 'A' /* %OVERLOAD hash */ +#define PERL_MAGIC_overload_elem 'a' /* %OVERLOAD hash element */ +#define PERL_MAGIC_overload_table 'c' /* Holds overload table (AMT) on stash */ +#define PERL_MAGIC_bm 'B' /* Boyer-Moore (fast string search) */ +#define PERL_MAGIC_regdata 'D' /* Regex match position data + (@+ and @- vars) */ +#define PERL_MAGIC_regdatum 'd' /* Regex match position data element */ +#define PERL_MAGIC_env 'E' /* %ENV hash */ +#define PERL_MAGIC_envelem 'e' /* %ENV hash element */ +#define PERL_MAGIC_fm 'f' /* Formline ('compiled' format) */ +#define PERL_MAGIC_regex_global 'g' /* m//g target / study()ed string */ +#define PERL_MAGIC_isa 'I' /* @ISA array */ +#define PERL_MAGIC_isaelem 'i' /* @ISA array element */ +#define PERL_MAGIC_nkeys 'k' /* scalar(keys()) lvalue */ +#define PERL_MAGIC_dbfile 'L' /* Debugger %_ might have been included somehow */ @@ -2284,7 +2427,7 @@ struct ufuncs { IV uf_index; }; -/* In pre-5.7-Perls the 'U' magic didn't get the thread context. +/* In pre-5.7-Perls the PERL_MAGIC_uvar magic didn't get the thread context. * XS code wanting to be backward compatible can do something * like the following: @@ -2350,7 +2493,7 @@ END_EXTERN_C # if defined(NeXT) || defined(__NeXT__) /* or whatever catches all NeXTs */ char *crypt (); /* Maybe more hosts will need the unprototyped version */ # else -# if !defined(WIN32) +# if !defined(WIN32) && !defined(VMS) char *crypt (const char*, const char*); # endif /* !WIN32 */ # endif /* !NeXT && !__NeXT__ */ @@ -2376,6 +2519,15 @@ I32 unlnk (char*); #define UNLINK PerlLIO_unlink #endif +/* some versions of glibc are missing the setresuid() proto */ +#if defined(HAS_SETRESUID) && !defined(HAS_SETRESUID_PROTO) +int setresuid(uid_t ruid, uid_t euid, uid_t suid); +#endif +/* some versions of glibc are missing the setresgid() proto */ +#if defined(HAS_SETRESGID) && !defined(HAS_SETRESGID_PROTO) +int setresgid(gid_t rgid, gid_t egid, gid_t sgid); +#endif + #ifndef HAS_SETREUID # ifdef HAS_SETRESUID # define setreuid(r,e) setresuid(r,e,(Uid_t)-1) @@ -2518,216 +2670,6 @@ EXT int PL_sig_num[]; #ifdef DOINIT #ifdef EBCDIC -#if '^' == 106 /* if defined(_OSD_POSIX) POSIX-BC */ -EXT unsigned char PL_a2e[] = { /* ASCII (ISO8859-1) to EBCDIC (POSIX-BC) */ - 0, 1, 2, 3, 55, 45, 46, 47, - 22, 5, 21, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 60, 61, 50, 38, - 24, 25, 63, 39, 28, 29, 30, 31, - 64, 90, 127, 123, 91, 108, 80, 125, - 77, 93, 92, 78, 107, 96, 75, 97, - 240, 241, 242, 243, 244, 245, 246, 247, - 248, 249, 122, 94, 76, 126, 110, 111, - 124, 193, 194, 195, 196, 197, 198, 199, - 200, 201, 209, 210, 211, 212, 213, 214, - 215, 216, 217, 226, 227, 228, 229, 230, - 231, 232, 233, 187, 188, 189, 106, 109, - 74, 129, 130, 131, 132, 133, 134, 135, - 136, 137, 145, 146, 147, 148, 149, 150, - 151, 152, 153, 162, 163, 164, 165, 166, - 167, 168, 169, 251, 79, 253, 255, 7, - 32, 33, 34, 35, 36, 37, 6, 23, - 40, 41, 42, 43, 44, 9, 10, 27, - 48, 49, 26, 51, 52, 53, 54, 8, - 56, 57, 58, 59, 4, 20, 62, 95, - 65, 170, 176, 177, 159, 178, 208, 181, - 121, 180, 154, 138, 186, 202, 175, 161, - 144, 143, 234, 250, 190, 160, 182, 179, - 157, 218, 155, 139, 183, 184, 185, 171, - 100, 101, 98, 102, 99, 103, 158, 104, - 116, 113, 114, 115, 120, 117, 118, 119, - 172, 105, 237, 238, 235, 239, 236, 191, - 128, 224, 254, 221, 252, 173, 174, 89, - 68, 69, 66, 70, 67, 71, 156, 72, - 84, 81, 82, 83, 88, 85, 86, 87, - 140, 73, 205, 206, 203, 207, 204, 225, - 112, 192, 222, 219, 220, 141, 142, 223 -}; -EXT unsigned char PL_e2a[] = { /* EBCDIC (POSIX-BC) to ASCII (ISO8859-1) */ - 0, 1, 2, 3, 156, 9, 134, 127, - 151, 141, 142, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 157, 10, 8, 135, - 24, 25, 146, 143, 28, 29, 30, 31, - 128, 129, 130, 131, 132, 133, 23, 27, - 136, 137, 138, 139, 140, 5, 6, 7, - 144, 145, 22, 147, 148, 149, 150, 4, - 152, 153, 154, 155, 20, 21, 158, 26, - 32, 160, 226, 228, 224, 225, 227, 229, - 231, 241, 96, 46, 60, 40, 43, 124, - 38, 233, 234, 235, 232, 237, 238, 239, - 236, 223, 33, 36, 42, 41, 59, 159, - 45, 47, 194, 196, 192, 193, 195, 197, - 199, 209, 94, 44, 37, 95, 62, 63, - 248, 201, 202, 203, 200, 205, 206, 207, - 204, 168, 58, 35, 64, 39, 61, 34, - 216, 97, 98, 99, 100, 101, 102, 103, - 104, 105, 171, 187, 240, 253, 254, 177, - 176, 106, 107, 108, 109, 110, 111, 112, - 113, 114, 170, 186, 230, 184, 198, 164, - 181, 175, 115, 116, 117, 118, 119, 120, - 121, 122, 161, 191, 208, 221, 222, 174, - 162, 163, 165, 183, 169, 167, 182, 188, - 189, 190, 172, 91, 92, 93, 180, 215, - 249, 65, 66, 67, 68, 69, 70, 71, - 72, 73, 173, 244, 246, 242, 243, 245, - 166, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 185, 251, 252, 219, 250, 255, - 217, 247, 83, 84, 85, 86, 87, 88, - 89, 90, 178, 212, 214, 210, 211, 213, - 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 179, 123, 220, 125, 218, 126 -}; -#endif /* POSIX-BC */ -#if '^' == 176 /* if defined(??) (OS/400?) 037 */ -EXT unsigned char PL_a2e[] = { /* ASCII (ISO8859-1) to EBCDIC (IBM-037) */ - 0, 1, 2, 3, 55, 45, 46, 47, - 22, 5, 37, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 60, 61, 50, 38, - 24, 25, 63, 39, 28, 29, 30, 31, - 64, 90, 127, 123, 91, 108, 80, 125, - 77, 93, 92, 78, 107, 96, 75, 97, - 240, 241, 242, 243, 244, 245, 246, 247, - 248, 249, 122, 94, 76, 126, 110, 111, - 124, 193, 194, 195, 196, 197, 198, 199, - 200, 201, 209, 210, 211, 212, 213, 214, - 215, 216, 217, 226, 227, 228, 229, 230, - 231, 232, 233, 186, 224, 187, 176, 109, - 121, 129, 130, 131, 132, 133, 134, 135, - 136, 137, 145, 146, 147, 148, 149, 150, - 151, 152, 153, 162, 163, 164, 165, 166, - 167, 168, 169, 192, 79, 208, 161, 7, - 32, 33, 34, 35, 36, 21, 6, 23, - 40, 41, 42, 43, 44, 9, 10, 27, - 48, 49, 26, 51, 52, 53, 54, 8, - 56, 57, 58, 59, 4, 20, 62, 255, - 65, 170, 74, 177, 159, 178, 106, 181, - 189, 180, 154, 138, 95, 202, 175, 188, - 144, 143, 234, 250, 190, 160, 182, 179, - 157, 218, 155, 139, 183, 184, 185, 171, - 100, 101, 98, 102, 99, 103, 158, 104, - 116, 113, 114, 115, 120, 117, 118, 119, - 172, 105, 237, 238, 235, 239, 236, 191, - 128, 253, 254, 251, 252, 173, 174, 89, - 68, 69, 66, 70, 67, 71, 156, 72, - 84, 81, 82, 83, 88, 85, 86, 87, - 140, 73, 205, 206, 203, 207, 204, 225, - 112, 221, 222, 219, 220, 141, 142, 223 -}; -EXT unsigned char PL_e2a[] = { /* EBCDIC (IBM-037) to ASCII (ISO8859-1) */ - 0, 1, 2, 3, 156, 9, 134, 127, - 151, 141, 142, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 157, 133, 8, 135, - 24, 25, 146, 143, 28, 29, 30, 31, - 128, 129, 130, 131, 132, 10, 23, 27, - 136, 137, 138, 139, 140, 5, 6, 7, - 144, 145, 22, 147, 148, 149, 150, 4, - 152, 153, 154, 155, 20, 21, 158, 26, - 32, 160, 226, 228, 224, 225, 227, 229, - 231, 241, 162, 46, 60, 40, 43, 124, - 38, 233, 234, 235, 232, 237, 238, 239, - 236, 223, 33, 36, 42, 41, 59, 172, - 45, 47, 194, 196, 192, 193, 195, 197, - 199, 209, 166, 44, 37, 95, 62, 63, - 248, 201, 202, 203, 200, 205, 206, 207, - 204, 96, 58, 35, 64, 39, 61, 34, - 216, 97, 98, 99, 100, 101, 102, 103, - 104, 105, 171, 187, 240, 253, 254, 177, - 176, 106, 107, 108, 109, 110, 111, 112, - 113, 114, 170, 186, 230, 184, 198, 164, - 181, 126, 115, 116, 117, 118, 119, 120, - 121, 122, 161, 191, 208, 221, 222, 174, - 94, 163, 165, 183, 169, 167, 182, 188, - 189, 190, 91, 93, 175, 168, 180, 215, - 123, 65, 66, 67, 68, 69, 70, 71, - 72, 73, 173, 244, 246, 242, 243, 245, - 125, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 185, 251, 252, 249, 250, 255, - 92, 247, 83, 84, 85, 86, 87, 88, - 89, 90, 178, 212, 214, 210, 211, 213, - 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 179, 219, 220, 217, 218, 159 -}; -#endif /* 037 */ -#if '^' == 95 /* if defined(__MVS__) || defined(??) (VM/ESA?) 1047 */ -EXT unsigned char PL_a2e[] = { /* ASCII (ISO8859-1) to EBCDIC (IBM-1047) */ - 0, 1, 2, 3, 55, 45, 46, 47, - 22, 5, 21, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 60, 61, 50, 38, - 24, 25, 63, 39, 28, 29, 30, 31, - 64, 90, 127, 123, 91, 108, 80, 125, - 77, 93, 92, 78, 107, 96, 75, 97, - 240, 241, 242, 243, 244, 245, 246, 247, - 248, 249, 122, 94, 76, 126, 110, 111, - 124, 193, 194, 195, 196, 197, 198, 199, - 200, 201, 209, 210, 211, 212, 213, 214, - 215, 216, 217, 226, 227, 228, 229, 230, - 231, 232, 233, 173, 224, 189, 95, 109, - 121, 129, 130, 131, 132, 133, 134, 135, - 136, 137, 145, 146, 147, 148, 149, 150, - 151, 152, 153, 162, 163, 164, 165, 166, - 167, 168, 169, 192, 79, 208, 161, 7, - 32, 33, 34, 35, 36, 37, 6, 23, - 40, 41, 42, 43, 44, 9, 10, 27, - 48, 49, 26, 51, 52, 53, 54, 8, - 56, 57, 58, 59, 4, 20, 62, 255, - 65, 170, 74, 177, 159, 178, 106, 181, - 187, 180, 154, 138, 176, 202, 175, 188, - 144, 143, 234, 250, 190, 160, 182, 179, - 157, 218, 155, 139, 183, 184, 185, 171, - 100, 101, 98, 102, 99, 103, 158, 104, - 116, 113, 114, 115, 120, 117, 118, 119, - 172, 105, 237, 238, 235, 239, 236, 191, - 128, 253, 254, 251, 252, 186, 174, 89, - 68, 69, 66, 70, 67, 71, 156, 72, - 84, 81, 82, 83, 88, 85, 86, 87, - 140, 73, 205, 206, 203, 207, 204, 225, - 112, 221, 222, 219, 220, 141, 142, 223 -}; -EXT unsigned char PL_e2a[] = { /* EBCDIC (IBM-1047) to ASCII (ISO8859-1) */ - 0, 1, 2, 3, 156, 9, 134, 127, - 151, 141, 142, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 157, 10, 8, 135, - 24, 25, 146, 143, 28, 29, 30, 31, - 128, 129, 130, 131, 132, 133, 23, 27, - 136, 137, 138, 139, 140, 5, 6, 7, - 144, 145, 22, 147, 148, 149, 150, 4, - 152, 153, 154, 155, 20, 21, 158, 26, - 32, 160, 226, 228, 224, 225, 227, 229, - 231, 241, 162, 46, 60, 40, 43, 124, - 38, 233, 234, 235, 232, 237, 238, 239, - 236, 223, 33, 36, 42, 41, 59, 94, - 45, 47, 194, 196, 192, 193, 195, 197, - 199, 209, 166, 44, 37, 95, 62, 63, - 248, 201, 202, 203, 200, 205, 206, 207, - 204, 96, 58, 35, 64, 39, 61, 34, - 216, 97, 98, 99, 100, 101, 102, 103, - 104, 105, 171, 187, 240, 253, 254, 177, - 176, 106, 107, 108, 109, 110, 111, 112, - 113, 114, 170, 186, 230, 184, 198, 164, - 181, 126, 115, 116, 117, 118, 119, 120, - 121, 122, 161, 191, 208, 91, 222, 174, - 172, 163, 165, 183, 169, 167, 182, 188, - 189, 190, 221, 168, 175, 93, 180, 215, - 123, 65, 66, 67, 68, 69, 70, 71, - 72, 73, 173, 244, 246, 242, 243, 245, - 125, 74, 75, 76, 77, 78, 79, 80, - 81, 82, 185, 251, 252, 249, 250, 255, - 92, 247, 83, 84, 85, 86, 87, 88, - 89, 90, 178, 212, 214, 210, 211, 213, - 48, 49, 50, 51, 52, 53, 54, 55, - 56, 57, 179, 219, 220, 217, 218, 159 -}; -#endif /* 1047 */ EXT unsigned char PL_fold[] = { /* fast EBCDIC case folding table */ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, @@ -2800,10 +2742,6 @@ EXTCONST unsigned char PL_fold[] = { #endif /* !EBCDIC */ #else EXTCONST unsigned char PL_fold[]; -#ifdef EBCDIC -EXTCONST unsigned char PL_e2a[]; -EXTCONST unsigned char PL_a2e[]; -#endif /* EBCDIC */ #endif #ifdef DOINIT @@ -2998,15 +2936,15 @@ enum { /* pass one of these to get_vtbl */ #define HINT_PRIVATE_MASK 0x000000ff #define HINT_INTEGER 0x00000001 #define HINT_STRICT_REFS 0x00000002 -/* #define HINT_notused4 0x00000004 */ -#define HINT_BYTE 0x00000008 +#define HINT_LOCALE 0x00000004 +#define HINT_BYTES 0x00000008 +#define HINT_BYTES 0x00000008 /* #define HINT_notused10 0x00000010 */ /* Note: 20,40,80 used for NATIVE_HINTS */ #define HINT_BLOCK_SCOPE 0x00000100 #define HINT_STRICT_SUBS 0x00000200 #define HINT_STRICT_VARS 0x00000400 -#define HINT_LOCALE 0x00000800 #define HINT_NEW_INTEGER 0x00001000 #define HINT_NEW_FLOAT 0x00002000 @@ -3540,16 +3478,18 @@ typedef struct am_table_short AMTS; #define SET_NUMERIC_LOCAL() \ set_numeric_local(); -#define IS_NUMERIC_RADIX(s) \ - ((PL_hints & HINT_LOCALE) && \ - PL_numeric_radix && memEQ(s, SvPVX(PL_numeric_radix), SvCUR(PL_numeric_radix))) +#define IN_LOCALE_RUNTIME (PL_curcop->op_private & HINT_LOCALE) +#define IN_LOCALE_COMPILETIME (PL_hints & HINT_LOCALE) + +#define IN_LOCALE \ + (PL_curcop == &PL_compiling ? IN_LOCALE_COMPILETIME : IN_LOCALE_RUNTIME) #define STORE_NUMERIC_LOCAL_SET_STANDARD() \ - bool was_local = (PL_hints & HINT_LOCALE) && PL_numeric_local; \ + bool was_local = PL_numeric_local && IN_LOCALE; \ if (was_local) SET_NUMERIC_STANDARD(); #define STORE_NUMERIC_STANDARD_SET_LOCAL() \ - bool was_standard = (PL_hints & HINT_LOCALE) && PL_numeric_standard; \ + bool was_standard = PL_numeric_standard && IN_LOCALE; \ if (was_standard) SET_NUMERIC_LOCAL(); #define RESTORE_NUMERIC_LOCAL() \ @@ -3564,12 +3504,13 @@ typedef struct am_table_short AMTS; #define SET_NUMERIC_STANDARD() /**/ #define SET_NUMERIC_LOCAL() /**/ -#define IS_NUMERIC_RADIX(c) (0) +#define IS_NUMERIC_RADIX(a, b) (0) #define STORE_NUMERIC_LOCAL_SET_STANDARD() /**/ #define STORE_NUMERIC_STANDARD_SET_LOCAL() /**/ #define RESTORE_NUMERIC_LOCAL() /**/ #define RESTORE_NUMERIC_STANDARD() /**/ #define Atof Perl_atof +#define IN_LOCALE_RUNTIME 0 #endif /* !USE_LOCALE_NUMERIC */ @@ -3669,7 +3610,9 @@ typedef struct am_table_short AMTS; #ifndef PERL_MICRO # ifndef PERL_OLD_SIGNALS -# define PERL_ASYNC_CHECK() if (PL_sig_pending) despatch_signals() +# ifndef PERL_ASYNC_CHECK +# define PERL_ASYNC_CHECK() if (PL_sig_pending) despatch_signals() +# endif # endif #endif @@ -3691,17 +3634,21 @@ typedef struct am_table_short AMTS; * nice_chunk and nice_chunk size need to be set * and queried under the protection of sv_mutex */ -#define offer_nice_chunk(chunk, chunk_size) do { \ - LOCK_SV_MUTEX; \ - if (!PL_nice_chunk) { \ - PL_nice_chunk = (char*)(chunk); \ - PL_nice_chunk_size = (chunk_size); \ - } \ - else { \ - Safefree(chunk); \ - } \ - UNLOCK_SV_MUTEX; \ - } while (0) +#define offer_nice_chunk(chunk, chunk_size) STMT_START { \ + void *new_chunk; \ + U32 new_chunk_size; \ + LOCK_SV_MUTEX; \ + new_chunk = (void *)(chunk); \ + new_chunk_size = (chunk_size); \ + if (new_chunk_size > PL_nice_chunk_size) { \ + if (PL_nice_chunk) Safefree(PL_nice_chunk); \ + PL_nice_chunk = new_chunk; \ + PL_nice_chunk_size = new_chunk_size; \ + } else { \ + Safefree(chunk); \ + } \ + UNLOCK_SV_MUTEX; \ + } STMT_END #ifdef HAS_SEM # include @@ -3743,6 +3690,10 @@ typedef struct am_table_short AMTS; # include #endif +#if defined(HAS_FLOCK) && !defined(HAS_FLOCK_PROTO) +int flock(int fd, int op); +#endif + #ifndef O_RDONLY /* Assume UNIX defaults */ # define O_RDONLY 0000 @@ -3762,6 +3713,9 @@ typedef struct am_table_short AMTS; #ifdef IAMSUID #ifdef I_SYS_STATVFS +# if defined(PERL_SCO) && !defined(_SVID3) +# define _SVID3 +# endif # include /* for f?statvfs() */ #endif #ifdef I_SYS_MOUNT @@ -3809,6 +3763,24 @@ typedef struct am_table_short AMTS; #define EXEC_ARGV_CAST(x) x #endif +#define IS_NUMBER_IN_UV 0x01 /* number within UV range (maybe not + int). value returned in pointed- + to UV */ +#define IS_NUMBER_GREATER_THAN_UV_MAX 0x02 /* pointed to UV undefined */ +#define IS_NUMBER_NOT_INT 0x04 /* saw . or E notation */ +#define IS_NUMBER_NEG 0x08 /* leading minus sign */ +#define IS_NUMBER_INFINITY 0x10 /* this is big */ + +#define GROK_NUMERIC_RADIX(sp, send) grok_numeric_radix(sp, send) + +/* to let user control profiling */ +#ifdef PERL_GPROF_CONTROL +extern void moncontrol(int); +#define PERL_GPROF_MONCONTROL(x) moncontrol(x) +#else +#define PERL_GPROF_MONCONTROL(x) +#endif + /* and finally... */ #define PERL_PATCHLEVEL_H_IMPLICIT #include "patchlevel.h" @@ -3839,6 +3811,24 @@ typedef struct am_table_short AMTS; NVff NVgf + HAS_USLEEP + HAS_UALARM + + HAS_SETITIMER + HAS_GETITIMER + + HAS_SENDMSG + HAS_RECVMSG + HAS_READV + HAS_WRITEV + I_SYSUIO + HAS_STRUCT_MSGHDR + HAS_STRUCT_CMSGHDR + + USE_REENTRANT_API + + HAS_NL_LANGINFO + so that Configure picks them up. */ #endif /* Include guard */