X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl.h;h=9f135b109c41b4add56e04bfbdd07c4e18c2a7dc;hb=c0393c90932dfbd5778207b0f3f2e6f99dc7fdb2;hp=1259f62693b637f39e42ad04363f271572e4bb12;hpb=19dff7e40d92bc1128f00a1505de8b2c3ab01314;p=p5sagit%2Fp5-mst-13.2.git diff --git a/perl.h b/perl.h index 1259f62..9f135b1 100644 --- a/perl.h +++ b/perl.h @@ -718,6 +718,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) @@ -1023,6 +1028,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 +1093,25 @@ typedef UVTYPE UV; # endif #endif +/* + I've tracked down a weird bug in Perl5.6.1 to the UTS compiler's + mishandling of MY_UV_MAX in util.c. It is defined as + #ifndef MY_UV_MAX + # define MY_UV_MAX ((UV)IV_MAX * (UV)2 + (UV)1) + #endif + The compiler handles {double floating point value} >= MY_UV_MAX as if + MY_UV_MAX were the signed integer -1. In fact it will do the same + thing with (UV)(0xffffffff), in place of MY_UV_MAX, though 0xffffffff + *without* the typecast to UV works fine. + + hom00@utsglobal.com (Hal Morris) 2001-05-02 + + */ + +#ifdef UTS +# define MY_UV_MAX 0xffffffff +#endif + #define IV_DIG (BIT_DIGITS(IVSIZE * 8)) #define UV_DIG (BIT_DIGITS(UVSIZE * 8)) @@ -1837,10 +1868,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 @@ -2131,64 +2164,142 @@ Gid_t getegid (void); : PerlIO_stderr()) #endif + +#define DEBUG_p_FLAG 0x00000001 /* 1 */ +#define DEBUG_s_FLAG 0x00000002 /* 2 */ +#define DEBUG_l_FLAG 0x00000004 /* 4 */ +#define DEBUG_t_FLAG 0x00000008 /* 8 */ +#define DEBUG_o_FLAG 0x00000010 /* 16 */ +#define DEBUG_c_FLAG 0x00000020 /* 32 */ +#define DEBUG_P_FLAG 0x00000040 /* 64 */ +#define DEBUG_m_FLAG 0x00000080 /* 128 */ +#define DEBUG_f_FLAG 0x00000100 /* 256 */ +#define DEBUG_r_FLAG 0x00000200 /* 512 */ +#define DEBUG_x_FLAG 0x00000400 /* 1024 */ +#define DEBUG_u_FLAG 0x00000800 /* 2048 */ +#define DEBUG_L_FLAG 0x00001000 /* 4096 */ +#define DEBUG_H_FLAG 0x00002000 /* 8192 */ +#define DEBUG_X_FLAG 0x00004000 /* 16384 */ +#define DEBUG_D_FLAG 0x00008000 /* 32768 */ +#define DEBUG_S_FLAG 0x00010000 /* 65536 */ +#define DEBUG_T_FLAG 0x00020000 /* 131072 */ +#define DEBUG_R_FLAG 0x00040000 /* 262144 */ +#define DEBUG_MASK 0x0007FFFF /* mask of all the standard flags */ + +#define DEBUG_DB_RECURSE_FLAG 0x40000000 +#define DEBUG_TOP_FLAG 0x80000000 /* XXX what's this for ??? */ + + #ifdef DEBUGGING -#undef YYDEBUG -#define YYDEBUG 1 -#define DEB(a) a -#define DEBUG(a) if (PL_debug) a -#define DEBUG_p(a) if (PL_debug & 1) a -#define DEBUG_s(a) if (PL_debug & 2) a -#define DEBUG_l(a) if (PL_debug & 4) a -#define DEBUG_t(a) if (PL_debug & 8) a -#define DEBUG_o(a) if (PL_debug & 16) a -#define DEBUG_c(a) if (PL_debug & 32) a -#define DEBUG_P(a) if (PL_debug & 64) a + +# undef YYDEBUG +# define YYDEBUG 1 + +# define DEBUG_p_TEST (PL_debug & DEBUG_p_FLAG) +# define DEBUG_s_TEST (PL_debug & DEBUG_s_FLAG) +# define DEBUG_l_TEST (PL_debug & DEBUG_l_FLAG) +# define DEBUG_t_TEST (PL_debug & DEBUG_t_FLAG) +# define DEBUG_o_TEST (PL_debug & DEBUG_o_FLAG) +# define DEBUG_c_TEST (PL_debug & DEBUG_c_FLAG) +# define DEBUG_P_TEST (PL_debug & DEBUG_P_FLAG) +# define DEBUG_m_TEST (PL_debug & DEBUG_m_FLAG) +# define DEBUG_f_TEST (PL_debug & DEBUG_f_FLAG) +# define DEBUG_r_TEST (PL_debug & DEBUG_r_FLAG) +# define DEBUG_x_TEST (PL_debug & DEBUG_x_FLAG) +# define DEBUG_u_TEST (PL_debug & DEBUG_u_FLAG) +# define DEBUG_L_TEST (PL_debug & DEBUG_L_FLAG) +# define DEBUG_H_TEST (PL_debug & DEBUG_H_FLAG) +# define DEBUG_X_TEST (PL_debug & DEBUG_X_FLAG) +# define DEBUG_D_TEST (PL_debug & DEBUG_D_FLAG) +# define DEBUG_S_TEST (PL_debug & DEBUG_S_FLAG) +# define DEBUG_T_TEST (PL_debug & DEBUG_T_FLAG) +# define DEBUG_R_TEST (PL_debug & DEBUG_R_FLAG) + +# define DEB(a) a +# define DEBUG(a) if (PL_debug) a +# define DEBUG_p(a) if (DEBUG_p_TEST) a +# define DEBUG_s(a) if (DEBUG_s_TEST) a +# define DEBUG_l(a) if (DEBUG_l_TEST) a +# define DEBUG_t(a) if (DEBUG_t_TEST) a +# define DEBUG_o(a) if (DEBUG_o_TEST) a +# define DEBUG_c(a) if (DEBUG_c_TEST) a +# define DEBUG_P(a) if (DEBUG_P_TEST) a + # if defined(PERL_OBJECT) -# define DEBUG_m(a) if (PL_debug & 128) a +# define DEBUG_m(a) if (DEBUG_m_TEST) a # else /* Temporarily turn off memory debugging in case the a * does memory allocation, either directly or indirectly. */ # define DEBUG_m(a) \ STMT_START { \ - if (PERL_GET_INTERP) { dTHX; if (PL_debug & 128) {PL_debug&=~128; a; PL_debug|=128;} } \ + if (PERL_GET_INTERP) { dTHX; if (DEBUG_m_TEST) {PL_debug&=~DEBUG_m_FLAG; a; PL_debug|=DEBUG_m_FLAG;} } \ } STMT_END # endif -#define DEBUG_f(a) if (PL_debug & 256) a -#define DEBUG_r(a) if (PL_debug & 512) a -#define DEBUG_x(a) if (PL_debug & 1024) a -#define DEBUG_u(a) if (PL_debug & 2048) a -#define DEBUG_L(a) if (PL_debug & 4096) a -#define DEBUG_H(a) if (PL_debug & 8192) a -#define DEBUG_X(a) if (PL_debug & 16384) a -#define DEBUG_D(a) if (PL_debug & 32768) a + +# 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 + # ifdef USE_THREADS -# define DEBUG_S(a) if (PL_debug & (1<<16)) a +# define DEBUG_S(a) if (DEBUG_S_TEST) a # else # define DEBUG_S(a) # endif -#define DEBUG_T(a) if (PL_debug & (1<<17)) a -#else -#define DEB(a) -#define DEBUG(a) -#define DEBUG_p(a) -#define DEBUG_s(a) -#define DEBUG_l(a) -#define DEBUG_t(a) -#define DEBUG_o(a) -#define DEBUG_c(a) -#define DEBUG_P(a) -#define DEBUG_m(a) -#define DEBUG_f(a) -#define DEBUG_r(a) -#define DEBUG_x(a) -#define DEBUG_u(a) -#define DEBUG_S(a) -#define DEBUG_H(a) -#define DEBUG_X(a) -#define DEBUG_D(a) -#define DEBUG_S(a) -#define DEBUG_T(a) -#endif + +# define DEBUG_T(a) if (DEBUG_T_TEST) a +# define DEBUG_R(a) if (DEBUG_R_TEST) a + +#else /* DEBUGGING */ + +# define DEBUG_p_TEST (0) +# define DEBUG_s_TEST (0) +# define DEBUG_l_TEST (0) +# define DEBUG_t_TEST (0) +# define DEBUG_o_TEST (0) +# define DEBUG_c_TEST (0) +# define DEBUG_P_TEST (0) +# define DEBUG_m_TEST (0) +# define DEBUG_f_TEST (0) +# define DEBUG_r_TEST (0) +# define DEBUG_x_TEST (0) +# define DEBUG_u_TEST (0) +# define DEBUG_L_TEST (0) +# define DEBUG_H_TEST (0) +# define DEBUG_X_TEST (0) +# define DEBUG_D_TEST (0) +# define DEBUG_S_TEST (0) +# define DEBUG_T_TEST (0) +# define DEBUG_R_TEST (0) + +# define DEB(a) +# define DEBUG(a) +# define DEBUG_p(a) +# define DEBUG_s(a) +# define DEBUG_l(a) +# define DEBUG_t(a) +# define DEBUG_o(a) +# define DEBUG_c(a) +# define DEBUG_P(a) +# define DEBUG_m(a) +# define DEBUG_f(a) +# define DEBUG_r(a) +# define DEBUG_x(a) +# define DEBUG_u(a) +# define DEBUG_L(a) +# define DEBUG_H(a) +# define DEBUG_X(a) +# define DEBUG_D(a) +# define DEBUG_S(a) +# define DEBUG_T(a) +# define DEBUG_R(a) +#endif /* DEBUGGING */ + + #define YYMAXDEPTH 300 #ifndef assert /* might have been included somehow */ @@ -2209,7 +2320,7 @@ struct ufuncs { /* In pre-5.7-Perls the 'U' magic didn't get the thread context. * XS code wanting to be backward compatible can do something * like the following: - + #ifndef PERL_MG_UFUNC #define PERL_MG_UFUNC(name,ix,sv) I32 name(IV ix, SV *sv) #endif @@ -2272,7 +2383,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__ */ @@ -2436,7 +2547,7 @@ EXT char *PL_sig_name[]; EXT int PL_sig_num[]; #endif -/* fast case folding tables */ +/* fast conversion and case folding tables */ #ifdef DOINIT #ifdef EBCDIC @@ -3250,7 +3361,7 @@ typedef struct am_table_short AMTS; #define IS_NUMERIC_RADIX(s) \ ((PL_hints & HINT_LOCALE) && \ - PL_numeric_radix && memEQ(s, SvPVX(PL_numeric_radix), SvCUR(PL_numeric_radix))) + PL_numeric_radix_sv && memEQ(s, SvPVX(PL_numeric_radix_sv), SvCUR(PL_numeric_radix_sv))) #define STORE_NUMERIC_LOCAL_SET_STANDARD() \ bool was_local = (PL_hints & HINT_LOCALE) && PL_numeric_local; \ @@ -3332,8 +3443,12 @@ typedef struct am_table_short AMTS; * Remap printf */ #undef printf +#ifdef __GNUC__ +#define printf(fmt,args...) PerlIO_stdoutf(fmt,##args) +#else #define printf PerlIO_stdoutf #endif +#endif /* if these never got defined, they need defaults */ #ifndef PERL_SET_CONTEXT @@ -3395,17 +3510,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 @@ -3466,6 +3585,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 @@ -3513,10 +3635,6 @@ typedef struct am_table_short AMTS; #define EXEC_ARGV_CAST(x) x #endif -#ifdef EBCDIC -#define ALPHAS_HAVE_GAPS -#endif - /* and finally... */ #define PERL_PATCHLEVEL_H_IMPLICIT #include "patchlevel.h" @@ -3547,6 +3665,20 @@ 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 + so that Configure picks them up. */ #endif /* Include guard */