perl 3.0 patch #6 patch 5 continued

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

diff --git a/perl.h b/perl.h
index 4808d56..a9e3f14 100644 (file)
--- a/perl.h
+++ b/perl.h
@@ -1,4 +1,4 @@
-/* $Header: perl.h,v 3.0.1.1 89/10/26 23:17:08 lwall Locked $
+/* $Header: perl.h,v 3.0.1.3 89/11/17 15:28:57 lwall Locked $
  *
  *    Copyright (c) 1989, Larry Wall
  *
@@ -6,6 +6,16 @@
  *    as specified in the README file that comes with the perl 3.0 kit.
  *
  * $Log:       perl.h,v $
+ * Revision 3.0.1.3  89/11/17  15:28:57  lwall
+ * patch5: byteorder now is a hex value
+ * patch5: Configure now looks for <time.h> including <sys/time.h>
+ * 
+ * Revision 3.0.1.2  89/11/11  04:39:38  lwall
+ * patch2: Configure may now set -DDEBUGGING
+ * patch2: netinet/in.h needed sys/types.h some places
+ * patch2: more <sys/time.h> and <time.h> wrangling
+ * patch2: yydebug moved to where type doesn't matter  
+ * 
  * Revision 3.0.1.1  89/10/26  23:17:08  lwall
  * patch1: vfork now conditionally defined based on VFORK
  * patch1: DEC risc machines have a buggy memcmp
@@ -16,10 +26,6 @@
  * 
  */
 
-#ifndef lint
-#define DEBUGGING
-#endif
-
 #define VOIDUSED 1
 #include "config.h"
 
@@ -33,7 +39,7 @@
 #   define vfork fork
 #endif
 
-#if defined(MEMCMP) && defined(mips) && BYTEORDER == 01234
+#if defined(MEMCMP) && defined(mips) && BYTEORDER == 0x1234
 #undef MEMCMP
 #endif
 
@@ -51,25 +57,27 @@ extern char *memcpy(), *memset();
 #include <setjmp.h>
 #include <sys/param.h> /* if this needs types.h we're still wrong */
 
-#ifdef I_NETINET_IN
-#include <netinet/in.h>
-#endif
-
 #ifndef _TYPES_                /* If types.h defines this it's easy. */
 #ifndef major          /* Does everyone's types.h define this? */
 #include <sys/types.h>
 #endif
 #endif
 
+#ifdef I_NETINET_IN
+#include <netinet/in.h>
+#endif
+
 #include <sys/stat.h>
 
-#ifdef TMINSYS
-#include <sys/time.h>
-#else
-#ifdef I_SYSTIME
+#if defined(TMINSYS) || defined(I_SYSTIME)
 #include <sys/time.h>
+#ifdef I_TIMETOO
+#include <time.h>
+#endif
 #else
 #include <time.h>
+#ifdef I_SYSTIMETOO
+#include <time.h>
 #endif
 #endif
 
@@ -93,6 +101,9 @@ extern char *memcpy(), *memset();
 #ifdef NDBM
 #include <ndbm.h>
 #define SOME_DBM
+#ifdef ODBM
+#undef ODBM
+#endif
 #else
 #ifdef ODBM
 #ifdef NULL
@@ -129,7 +140,11 @@ EXT int dbmlen;
 #define DIRENT dirent
 #else
 #ifdef I_SYSDIR
+#ifdef hp9000s500
+#include <ndir.h>      /* may be wrong in the future */
+#else
 #include <sys/dir.h>
+#endif
 #define DIRENT direct
 #endif
 #endif
@@ -230,11 +245,23 @@ EXT STR *Str;
 #define STR_GROW(str,len) if ((str)->str_len < (len)) str_grow(str,len)
 
 #ifndef BYTEORDER
-#define BYTEORDER 01234
+#define BYTEORDER 0x1234
 #endif
 
+#if defined(htonl) && !defined(HTONL)
+#define HTONL
+#endif
+#if defined(htons) && !defined(HTONS)
+#define HTONS
+#endif
+#if defined(ntohl) && !defined(NTOHL)
+#define NTOHL
+#endif
+#if defined(ntohs) && !defined(NTOHS)
+#define NTOHS
+#endif
 #ifndef HTONL
-#if BYTEORDER != 04321
+#if (BYTEORDER != 0x4321) && (BYTEORDER != 0x87654321)
 #define HTONS
 #define HTONL
 #define NTOHS
@@ -246,7 +273,7 @@ EXT STR *Str;
 #define ntohl my_ntohl
 #endif
 #else
-#if BYTEORDER == 04321
+#if (BYTEORDER == 0x4321) || (BYTEORDER == 0x87654321)
 #undef HTONS
 #undef HTONL
 #undef NTOHS
@@ -419,7 +446,10 @@ EXT bool sawstudy INIT(FALSE);             /* do fbminstr on all strings */
 EXT bool sawi INIT(FALSE);             /* study must assume case insensitive */
 EXT bool sawvec INIT(FALSE);
 
-EXT int csh INIT(0);           /* 1 if /bin/csh is there, -1 if not */
+#ifdef CSH
+char *cshname INIT(CSH);
+int cshlen INIT(0);
+#endif /* CSH */
 
 #ifdef TAINT
 EXT bool tainted INIT(FALSE);          /* using variables controlled by $< */
@@ -469,7 +499,6 @@ EXT int dlmax INIT(128);
 EXT char *debname;
 EXT char *debdelim;
 #define YYDEBUG 1
-extern int yydebug;
 #endif
 EXT int perldb INIT(0);