Integrate changes 17322, 8309 and part of 10534,

as suggested by Stas Bakman, to suppress compilation
warnings in XS and in mod_perl.

p4raw-id: //depot/maint-5.6/perl-5.6.2@21434

2 files changed, 11 insertions, 1 deletions

diff --git a/lib/ExtUtils/xsubpp b/lib/ExtUtils/xsubpp
index bb8f3aab04..abb110b972 100755
--- a/lib/ExtUtils/xsubpp
+++ b/lib/ExtUtils/xsubpp
@@ -1183,6 +1183,7 @@ while (fetch_para()) {
 
     # print function header
     print Q<<"EOF";
+#XS(XS_${Full_func_name}); /* prototype to pass -Wmissing-prototypes */
 #XS(XS_${Full_func_name})
 #[[
 #    dXSARGS;
@@ -1502,14 +1503,19 @@ print Q<<"EOF";
 EOF
 
 print Q<<"EOF";
+#XS(boot_$Module_cname); /* prototype to pass -Wmissing-prototypes */
 #XS(boot_$Module_cname)
 EOF
 
 print Q<<"EOF";
 #[[
 #    dXSARGS;
+EOF
+
+#-Wall: if there is no $Full_func_name there are no xsubs in this .xs
+#so `file' is unused
+print Q<<"EOF" if $Full_func_name;
 #    char* file = __FILE__;
-#
 EOF
 
 print Q<<"EOF" if $WantVersionChk ;
diff --git a/perl.h b/perl.h
index f2c69e5822..daab27bc21 100644
--- a/perl.h
+++ b/perl.h
@@ -20,7 +20,11 @@
 #define USE_STDIO
 #endif /* PERL_FOR_X2P */
 
+#ifdef VOIDUSED
+#   undef VOIDUSED
+#endif 
 #define VOIDUSED 1
+
 #include "config.h"
 
 #if defined(USE_ITHREADS) && defined(USE_5005THREADS)