perl 4.0 patch 2: Patch 1 continued

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

diff --git a/perl.h b/perl.h
index 52d9e16..96d5d55 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -1,4 +1,4 @@
-/* $Header: perl.h,v 4.0 91/03/20 01:37:56 lwall Locked $
+/* $RCSfile: perl.h,v $$Revision: 4.0.1.1 $$Date: 91/04/11 17:49:51 $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,12 +6,15 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log:       perl.h,v $
+ * Revision 4.0.1.1  91/04/11  17:49:51  lwall
+ * patch1: hopefully straightened out some of the Xenix mess
+ * 
  * Revision 4.0  91/03/20  01:37:56  lwall
  * 4.0 baseline.
  * 
  */
 
-#define VOIDUSED 1
+#define VOIDWANT 1
 #include "config.h"
 
 #ifdef MSDOS
@@ -148,6 +151,7 @@ extern int errno;     /* ANSI allows errno to be an lvalue expr */
 #endif
 #endif
 
+#ifndef strerror
 #ifdef HAS_STRERROR
 char *strerror();
 #else
@@ -155,6 +159,7 @@ extern int sys_nerr;
 extern char *sys_errlist[];
 #define strerror(e) ((e) < 0 || (e) >= sys_nerr ? "(unknown)" : sys_errlist[e])
 #endif
+#endif
 
 #ifdef I_SYSIOCTL
 #ifndef _IOCTL_
@@ -221,7 +226,7 @@ EXT int dbmlen;
 #define ntohi ntohl
 #endif
 
-#if defined(I_DIRENT) && !defined(M_XENIX)
+#if defined(I_DIRENT)
 #   include <dirent.h>
 #   define DIRENT dirent
 #else
@@ -592,6 +597,8 @@ ARRAY *saveary();
 EXT char **origargv;
 EXT int origargc;
 EXT char **origenviron;
+extern char **environ;
+
 EXT line_t subline INIT(0);
 EXT STR *subname INIT(Nullstr);
 EXT int arybase INIT(0);