From bdea967c6ddd9640355c80b2908ca4f349aa314c Mon Sep 17 00:00:00 2001 From: Brian Fraser Date: Wed, 11 Sep 2013 16:57:57 -0300 Subject: [PATCH] Consistently use __sun to identify SunOS The core mostly used __sun already, but '__sun__' and 'sun' were also present. --- perl.h | 2 +- perlio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/perl.h b/perl.h index 163178c..afc2bc8 100644 --- a/perl.h +++ b/perl.h @@ -4028,7 +4028,7 @@ EXT char *** environ_pointer; /* VMS and some other platforms don't use the environ array */ # ifdef USE_ENVIRON_ARRAY # if !defined(DONT_DECLARE_STD) || \ - (defined(__svr4__) && defined(__GNUC__) && defined(sun)) || \ + (defined(__svr4__) && defined(__GNUC__) && defined(__sun)) || \ defined(__sgi) extern char ** environ; /* environment variables supplied via exec */ # endif diff --git a/perlio.c b/perlio.c index 4693366..2591f89 100644 --- a/perlio.c +++ b/perlio.c @@ -3169,7 +3169,7 @@ PerlIOStdio_invalidate_fileno(pTHX_ FILE *f) */ f->_fileno = -1; return 1; -# elif defined(__sun__) +# elif defined(__sun) PERL_UNUSED_ARG(f); return 0; # elif defined(__hpux) -- 2.7.4