Integrate:

[ 21360]
Subject: [perl #24032] Perl 5.8.1-RC5 build problems on LynxOS 
From: Olli Savia (via RT) <perlbug-followup@perl.org>
Message-ID: <rt-24032-65280.10.6144413163834@rt.perl.org>

[ 21361]
Even though undefing SPACE and FORMAT should be safe,
at this point I'm choosing to be paranoid and using
#ifdef __Lynx__.
p4raw-link: @21361 on //depot/perl: d4c3c482d093813d66a1c163e8cf7f1e489ab3cf
p4raw-link: @21360 on //depot/perl: 9cffb1113116ebdeea2d588063f221f44cc71108

p4raw-id: //depot/maint-5.8/perl@21362
p4raw-integrated: from //depot/perl@21359 'copy in' perlio.c (@21217..)
	pp_sys.c (@21277..) 'merge in' mg.c (@20829..) perl.h
	(@21326..)

4 files changed, 39 insertions, 0 deletions

diff --git a/mg.c b/mg.c
index 65a0e4324a..4926c5aed6 100644
--- a/mg.c
+++ b/mg.c
@@ -48,6 +48,14 @@ Signal_t Perl_csighandler(int sig);
 static void restore_magic(pTHX_ void *p);
 static void unwind_handler_stack(pTHX_ void *p);
 
+#ifdef __Lynx__
+/* Missing protos on LynxOS */
+void setruid(uid_t id);
+void seteuid(uid_t id);
+void setrgid(uid_t id);
+void setegid(uid_t id);
+#endif
+
 /*
  * Use the "DESTRUCTOR" scope cleanup to reinstate magic.
  */
diff --git a/perl.h b/perl.h
index 2a4c040c9c..97b0678737 100644
--- a/perl.h
+++ b/perl.h
@@ -3298,6 +3298,16 @@ END_EXTERN_C
 /*****************************************************************************/
 /* XXX This needs to be revisited, since BEGIN makes yacc re-enter... */
 
+#ifdef __Lynx__
+/* LynxOS defines these in scsi.h which is included via ioctl.h */
+#ifdef FORMAT
+#undef FORMAT
+#endif
+#ifdef SPACE
+#undef SPACE
+#endif
+#endif
+
 #include "perly.h"
 
 #define LEX_NOTPARSING		11	/* borrowed from toke.c */
@@ -4205,6 +4215,10 @@ typedef struct am_table_short AMTS;
 #  include <fcntl.h>
 #endif
 
+#ifdef __Lynx__
+#  include <fcntl.h>
+#endif
+
 #ifdef I_SYS_FILE
 #  include <sys/file.h>
 #endif
diff --git a/perlio.c b/perlio.c
index c3b331d70c..faa3b19369 100644
--- a/perlio.c
+++ b/perlio.c
@@ -50,6 +50,11 @@
 
 #include "XSUB.h"
 
+#ifdef __Lynx__
+/* Missing proto on LynxOS */
+int mkstemp(char*);
+#endif
+
 /* Call the callback or PerlIOBase, and return failure. */
 #define Perl_PerlIO_or_Base(f, callback, base, failure, args) 	\
 	if (PerlIOValid(f)) {					\
diff --git a/pp_sys.c b/pp_sys.c
index 8c9c3cce48..8253df9e10 100644
--- a/pp_sys.c
+++ b/pp_sys.c
@@ -176,6 +176,18 @@ static char zero_but_true[ZBTLEN + 1] = "0 but true";
 
 #include "reentr.h"
 
+#ifdef __Lynx__
+/* Missing protos on LynxOS */
+void sethostent(int);
+void endhostent(void);
+void setnetent(int);
+void endnetent(void);
+void setprotoent(int);
+void endprotoent(void);
+void setservent(int);
+void endservent(void);
+#endif
+
 #undef PERL_EFF_ACCESS_R_OK	/* EFFective uid/gid ACCESS R_OK */
 #undef PERL_EFF_ACCESS_W_OK
 #undef PERL_EFF_ACCESS_X_OK