Modify the common guard for the signal.h header, because

C99 compilers don't like it.o

see :
Subject: UNIX03 & C99 issue with 5.8.2
Message-ID: <3FDA4994.6050209@sun.com>

p4raw-id: //depot/perl@21883

diff --git a/doio.c b/doio.c
index af4d17d..40287f9 100644 (file)
--- a/doio.c
+++ b/doio.c
@@ -48,7 +48,7 @@
 #  define OPEN_EXCL 0
 #endif
 
 #  define OPEN_EXCL 0
 #endif
 

-#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX)
+#if !defined(NSIG) || defined(M_UNIX) || defined(__unix) || defined(M_XENIX)

 #include <signal.h>
 #endif
 
 #include <signal.h>
 #endif
 

diff --git a/doop.c b/doop.c
index 5a41f6a..91c7ae1 100644 (file)
--- a/doop.c
+++ b/doop.c
@@ -17,7 +17,7 @@
 #include "perl.h"
 
 #ifndef PERL_MICRO
 #include "perl.h"
 
 #ifndef PERL_MICRO

-#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX)
+#if !defined(NSIG) || defined(M_UNIX) || defined(__unix) || defined(M_XENIX)

 #include <signal.h>
 #endif
 #endif
 #include <signal.h>
 #endif
 #endif

diff --git a/mg.c b/mg.c
index 4ef7910..0cd6940 100644 (file)
--- a/mg.c
+++ b/mg.c
@@ -398,7 +398,7 @@ Perl_mg_free(pTHX_ SV *sv)
 }
 
 
 }
 
 

-#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX)
+#if !defined(NSIG) || defined(M_UNIX) || defined(__unix) || defined(M_XENIX)

 #include <signal.h>
 #endif
 
 #include <signal.h>
 #endif
 

diff --git a/mpeix/mpeixish.h b/mpeix/mpeixish.h
index 658e72e..4e96f0e 100644 (file)
--- a/mpeix/mpeixish.h
+++ b/mpeix/mpeixish.h
@@ -87,7 +87,7 @@
  */
 /* #define ALTERNATE_SHEBANG "#!" / **/
 
  */
 /* #define ALTERNATE_SHEBANG "#!" / **/
 

-#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX)
+#if !defined(NSIG) || defined(M_UNIX) || defined(__unix) || defined(M_XENIX)

 # include <signal.h>
 #endif
 
 # include <signal.h>
 #endif
 

diff --git a/plan9/plan9ish.h b/plan9/plan9ish.h
index 5c922cf..1469e10 100644 (file)
--- a/plan9/plan9ish.h
+++ b/plan9/plan9ish.h
@@ -93,7 +93,7 @@
  */
 /* #define ALTERNATE_SHEBANG "#!" / **/
 
  */
 /* #define ALTERNATE_SHEBANG "#!" / **/
 

-#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX)
+#if !defined(NSIG) || defined(M_UNIX) || defined(__unix) || defined(M_XENIX)

 # include <signal.h>
 #endif
 
 # include <signal.h>
 #endif
 

diff --git a/unixish.h b/unixish.h
index 4bf3709..65ce7d6 100644 (file)
--- a/unixish.h
+++ b/unixish.h
@@ -103,7 +103,7 @@
  */
 /* #define ALTERNATE_SHEBANG "#!" / **/
 
  */
 /* #define ALTERNATE_SHEBANG "#!" / **/
 

-#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#if !defined(NSIG) || defined(M_UNIX) || defined(__unix) || defined(M_XENIX) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)

 # include <signal.h>
 #endif
 
 # include <signal.h>
 #endif
 

diff --git a/util.c b/util.c
index 4a1a45f..602bc9b 100644 (file)
--- a/util.c
+++ b/util.c
@@ -18,7 +18,7 @@
 #include "perl.h"
 
 #ifndef PERL_MICRO
 #include "perl.h"
 
 #ifndef PERL_MICRO

-#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX)
+#if !defined(NSIG) || defined(M_UNIX) || defined(__unix) || defined(M_XENIX)

 #include <signal.h>
 #endif
 
 #include <signal.h>
 #endif