undef c99_foo ifndef HAS_FOO

[perl5.git] / perl.h

diff --git a/perl.h b/perl.h
index da1f94f..580ad6a 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -1761,11 +1761,9 @@ typedef UVTYPE UV;
 #define FPTR2DPTR(t,p) ((t)PTR2nat(p)) /* function pointer to data pointer */
 
 #ifdef USE_LONG_DOUBLE
-#  if defined(HAS_LONG_DOUBLE) && LONG_DOUBLESIZE == DOUBLESIZE
-#      define LONG_DOUBLE_EQUALS_DOUBLE
-#  endif
-#  if !(defined(HAS_LONG_DOUBLE) && (LONG_DOUBLESIZE > DOUBLESIZE))
-#     undef USE_LONG_DOUBLE /* Ouch! */
+#  if LONG_DOUBLESIZE == DOUBLESIZE
+#    define LONG_DOUBLE_EQUALS_DOUBLE
+#    undef USE_LONG_DOUBLE /* Ouch! */
 #  endif
 #endif
 
@@ -5223,8 +5221,8 @@ typedef enum {
 
 #define HINT_FEATURE_MASK      0x1c000000 /* 3 bits for feature bundles */
 
-                               /* Note: Used for NATIVE_HINTS, currently
-                                  defined by vms/vmsish.h:
+                               /* Note: Used for HINT_M_VMSISH_*,
+                                  currently defined by vms/vmsish.h:
                                0x40000000
                                0x80000000
                                 */
@@ -5495,6 +5493,26 @@ END_EXTERN_C
 #undef PERLVARI
 #undef PERLVARIC
 
+#if !defined(MULTIPLICITY)
+/* Set up PERLVAR macros for populating structs */
+#  define PERLVAR(prefix,var,type) type prefix##var;
+/* 'var' is an array of length 'n' */
+#  define PERLVARA(prefix,var,n,type) type prefix##var[n];
+/* initialize 'var' to init' */
+#  define PERLVARI(prefix,var,type,init) type prefix##var;
+/* like PERLVARI, but make 'var' a const */
+#  define PERLVARIC(prefix,var,type,init) type prefix##var;
+
+/* this is never instantiated, is it just used for sizeof(struct PerlHandShakeInterpreter) */
+struct PerlHandShakeInterpreter {
+#  include "intrpvar.h"
+};
+#  undef PERLVAR
+#  undef PERLVARA
+#  undef PERLVARI
+#  undef PERLVARIC
+#endif
+
 START_EXTERN_C
 
 /* dummy variables that hold pointers to both runops functions, thus forcing
@@ -5680,19 +5698,19 @@ typedef struct am_table_short AMTS;
 #define PERLDBf_SAVESRC_NOSUBS 0x800   /* Including evals that generate no subroutines */
 #define PERLDBf_SAVESRC_INVALID        0x1000  /* Save source that did not compile */
 
-#define PERLDB_SUB     (PL_perldb && (PL_perldb & PERLDBf_SUB))
-#define PERLDB_LINE    (PL_perldb && (PL_perldb & PERLDBf_LINE))
-#define PERLDB_NOOPT   (PL_perldb && (PL_perldb & PERLDBf_NOOPT))
-#define PERLDB_INTER   (PL_perldb && (PL_perldb & PERLDBf_INTER))
-#define PERLDB_SUBLINE (PL_perldb && (PL_perldb & PERLDBf_SUBLINE))
-#define PERLDB_SINGLE  (PL_perldb && (PL_perldb & PERLDBf_SINGLE))
-#define PERLDB_SUB_NN  (PL_perldb && (PL_perldb & (PERLDBf_NONAME)))
-#define PERLDB_GOTO    (PL_perldb && (PL_perldb & PERLDBf_GOTO))
-#define PERLDB_NAMEEVAL        (PL_perldb && (PL_perldb & PERLDBf_NAMEEVAL))
-#define PERLDB_NAMEANON        (PL_perldb && (PL_perldb & PERLDBf_NAMEANON))
-#define PERLDB_SAVESRC         (PL_perldb && (PL_perldb & PERLDBf_SAVESRC))
-#define PERLDB_SAVESRC_NOSUBS  (PL_perldb && (PL_perldb & PERLDBf_SAVESRC_NOSUBS))
-#define PERLDB_SAVESRC_INVALID (PL_perldb && (PL_perldb & PERLDBf_SAVESRC_INVALID))
+#define PERLDB_SUB             (PL_perldb & PERLDBf_SUB)
+#define PERLDB_LINE            (PL_perldb & PERLDBf_LINE)
+#define PERLDB_NOOPT           (PL_perldb & PERLDBf_NOOPT)
+#define PERLDB_INTER           (PL_perldb & PERLDBf_INTER)
+#define PERLDB_SUBLINE         (PL_perldb & PERLDBf_SUBLINE)
+#define PERLDB_SINGLE          (PL_perldb & PERLDBf_SINGLE)
+#define PERLDB_SUB_NN          (PL_perldb & PERLDBf_NONAME)
+#define PERLDB_GOTO            (PL_perldb & PERLDBf_GOTO)
+#define PERLDB_NAMEEVAL        (PL_perldb & PERLDBf_NAMEEVAL)
+#define PERLDB_NAMEANON        (PL_perldb & PERLDBf_NAMEANON)
+#define PERLDB_SAVESRC         (PL_perldb & PERLDBf_SAVESRC)
+#define PERLDB_SAVESRC_NOSUBS  (PL_perldb & PERLDBf_SAVESRC_NOSUBS)
+#define PERLDB_SAVESRC_INVALID (PL_perldb & PERLDBf_SAVESRC_INVALID)
 
 #ifdef USE_LOCALE
 /* These locale things are all subject to change */