X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl.h;h=9b1fb5e60067a561a8a111cba4ec74052fc136d7;hb=5fd9e9a4300f95315d24c4b2a79cc95e32b1bdb7;hp=9138ba65714e54dcdcf1ddeb5cb51d6de094944b;hpb=22fae026e9f4859841088a1c5609be12b0b1d4f3;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perl.h b/perl.h
index 9138ba6..9b1fb5e 100644
--- a/perl.h
+++ b/perl.h
@@ -113,7 +113,8 @@ register struct op *op asm(stringify(OP_IN_REGISTER));
 # define STANDARD_C 1
 #endif
 
-#if defined(__cplusplus) || defined(WIN32) || defined(__sgi) || defined(OS2)
+#if defined(__cplusplus) || defined(WIN32) || defined(__sgi) || defined(OS2) \
+	|| defined(__DGUX)
 # define DONT_DECLARE_STD 1
 #endif
 
@@ -204,6 +205,11 @@ register struct op *op asm(stringify(OP_IN_REGISTER));
 #endif
 
 #include "perlio.h"
+#include "perllio.h"
+#include "perlsock.h"
+#include "perlproc.h"
+#include "perlenv.h"
+#include "perldir.h"
 
 #ifdef USE_NEXT_CTYPE
 
@@ -944,7 +950,7 @@ typedef union any ANY;
 typedef I32 (*filter_t) _((int, SV *, int));
 #define FILTER_READ(idx, sv, len)  filter_read(idx, sv, len)
 #define FILTER_DATA(idx)	   (AvARRAY(rsfp_filters)[idx])
-#define FILTER_ISREADER(idx)	   (idx >= AvFILL(rsfp_filters))
+#define FILTER_ISREADER(idx)	   (idx >= AvFILLp(rsfp_filters))
 
 #ifdef DOSISH
 # if defined(OS2)
@@ -1255,7 +1261,7 @@ Gid_t getegid _((void));
 	if (!(what)) {							\
 	    croak("Assertion failed: file \"%s\", line %d",		\
 		__FILE__, __LINE__);					\
-	    exit(1);							\
+	    PerlProc_exit(1);							\
 	}})
 #endif
 
@@ -1382,7 +1388,9 @@ int runops_debug _((void));
 
 /* VMS doesn't use environ array and NeXT has problems with crt0.o globals */
 #if !defined(VMS) && !(defined(NeXT) && defined(__DYNAMIC__))
-#if !defined(DONT_DECLARE_STD) || (defined(__svr4__) && defined(__GNUC__) && defined(sun)) || defined(__sgi)
+#if !defined(DONT_DECLARE_STD) \
+	|| (defined(__svr4__) && defined(__GNUC__) && defined(sun)) \
+	|| defined(__sgi) || defined(__DGUX)
 extern char **	environ;	/* environment variables supplied via exec */
 #endif
 #else
@@ -1747,7 +1755,7 @@ EXT MGVTBL vtbl_sigelem =	{magic_getsig,
 					magic_setsig,
 					0,	magic_clearsig,
 							0};
-EXT MGVTBL vtbl_pack =	{0,	0,	0,	magic_wipepack,
+EXT MGVTBL vtbl_pack =	{0,	0,	magic_sizepack,	magic_wipepack,
 							0};
 EXT MGVTBL vtbl_packelem =	{magic_getpack,
 				magic_setpack,