Fix bug in DynaLoader, which has been passing a filename in dynamic

[p5sagit/p5-mst-13.2.git] / perl.h

diff --git a/perl.h b/perl.h
index 5145e10..de0137d 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -137,7 +137,7 @@
 #  endif
 #endif
 
-#define pVAR    register struct perl_vars* const my_vars PERL_UNUSED_DECL
+#define pVAR    register struct perl_vars* my_vars PERL_UNUSED_DECL
 
 #ifdef PERL_GLOBAL_STRUCT
 #  define dVAR         pVAR    = (struct perl_vars*)PERL_GET_VARS()
@@ -247,8 +247,8 @@
 #  define PERL_UNUSED_CONTEXT
 #endif
 
-#define NOOP (void)0
-#define dNOOP extern int Perl___notused PERL_UNUSED_DECL
+#define NOOP /*EMPTY*/(void)0
+#define dNOOP extern int /*@unused@*/ Perl___notused PERL_UNUSED_DECL
 
 #ifndef pTHX
 /* Don't bother defining tTHX and sTHX; using them outside
@@ -343,7 +343,7 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER));
 #  endif
 #endif
 
-#if defined(__STRICT_ANSI__) && defined(PERL_GCC_PEDANTIC)
+#if defined(PERL_GCC_PEDANTIC)
 #  if !defined(PERL_GCC_BRACE_GROUPS_FORBIDDEN)
 #    define PERL_GCC_BRACE_GROUPS_FORBIDDEN
 #  endif
@@ -845,7 +845,7 @@ int usleep(unsigned int);
 #  include "embed.h"
 #  ifndef PERL_MAD
 #    undef op_getmad
-#    define op_getmad(arg,pegop,slot) /*EMPTY*/
+#    define op_getmad(arg,pegop,slot) NOOP
 #  endif
 #endif
 
@@ -1435,6 +1435,12 @@ int sockatmark(int);
 */
 #ifdef SPRINTF_RETURNS_STRLEN
 #  define my_sprintf sprintf
+#  ifdef HAS_SNPRINTF
+#    define USE_SNPRINTF
+#  endif
+#  ifdef HAS_VSNPRINTF
+#    define USE_VSNPRINTF
+#  endif
 #else
 #  define my_sprintf Perl_my_sprintf
 #endif
@@ -2334,7 +2340,7 @@ typedef struct clone_params CLONE_PARAMS;
 #   include "embed.h"
 #  ifndef PERL_MAD
 #    undef op_getmad
-#    define op_getmad(arg,pegop,slot) /*EMPTY*/
+#    define op_getmad(arg,pegop,slot) NOOP
 #  endif
 #   define ISHISH "vms"
 #endif
@@ -2368,7 +2374,7 @@ typedef struct clone_params CLONE_PARAMS;
 #   include "embed.h"
 #  ifndef PERL_MAD
 #    undef op_getmad
-#    define op_getmad(arg,pegop,slot) /*EMPTY*/
+#    define op_getmad(arg,pegop,slot) NOOP
 #  endif
 #   define ISHISH "symbian"
 #endif
@@ -4371,7 +4377,7 @@ END_EXTERN_C
 #  include "embed.h"
 #  ifndef PERL_MAD
 #    undef op_getmad
-#    define op_getmad(arg,pegop,slot) /*EMPTY*/
+#    define op_getmad(arg,pegop,slot) NOOP
 #  endif
 #endif