Patch applying of #3499 had gone awry.

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

diff --git a/perl.h b/perl.h
index cee3d09..97e130d 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -1466,6 +1466,8 @@ typedef pthread_key_t     perl_key;
 # else
 #  ifdef FFLUSH_ALL
 #   define PERL_FLUSHALL_FOR_CHILD     my_fflush_all()
+#  else
+#   define PERL_FLUSHALL_FOR_CHILD     (void)0
 #  endif
 # endif
 #endif
@@ -1536,8 +1538,6 @@ union any {
 #include "mg.h"
 #include "scope.h"
 #include "warning.h"
-#include "bytecode.h"
-#include "byterun.h"
 #include "utf8.h"
 
 /* Current curly descriptor */
@@ -2436,7 +2436,7 @@ PERLVAR(object_compatibility[30], char)
 #undef PERLVARI
 #undef PERLVARIC
 
-#if defined(HASATTRIBUTE) && defined(WIN32)
+#if defined(HASATTRIBUTE) && defined(WIN32) && !defined(CYGWIN32)
 /*
  * This provides a layer of functions and macros to ensure extensions will
  * get to use the same RTL functions as the core.