X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=x2p%2Fa2p.h;h=b00b0723eab3486a7a1ffc529a157f8d1747bccc;hb=77a005ab9f9f951511e847aba59fbf2ab1bb17e3;hp=a51db47a6e9a29783254e0c62939456f05f5918e;hpb=428aff04f68cac81d1ac4aee891e4fd14a1e4a9e;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/x2p/a2p.h b/x2p/a2p.h
index a51db47..b00b072 100644
--- a/x2p/a2p.h
+++ b/x2p/a2p.h
@@ -1,6 +1,6 @@
 /* $RCSfile: a2p.h,v $$Revision: 4.1 $$Date: 92/08/07 18:29:09 $
  *
- *    Copyright (c) 1991, Larry Wall
+ *    Copyright (c) 1991-1997, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -8,9 +8,12 @@
  * $Log:	a2p.h,v $
  */
 
-#include "../embed.h"
 #define VOIDUSED 1
-#include "../config.h"
+#ifdef VMS
+#  include "config.h"
+#else
+#  include "../config.h"
+#endif
 
 #if defined(__STDC__) || defined(vax11c) || defined(_AIX) || defined(__stdc__) || defined(__cplusplus)
 # define STANDARD_C 1
@@ -31,7 +34,6 @@
 #  include <sys/types.h>
 #endif
 
-
 #ifdef USE_NEXT_CTYPE
 
 #if NX_CURRENT_COMPILER_RELEASE >= 400
@@ -46,6 +48,15 @@
 
 #define MEM_SIZE Size_t
 
+#ifdef STANDARD_C
+#   include <stdlib.h>
+#else
+    Malloc_t malloc _((MEM_SIZE nbytes));
+    Malloc_t calloc _((MEM_SIZE elements, MEM_SIZE size));
+    Malloc_t realloc _((Malloc_t where, MEM_SIZE nbytes));
+    Free_t   free _((Malloc_t where));
+#endif
+
 #if defined(I_STRING) || defined(__cplusplus)
 #   include <string.h>
 #else
@@ -93,7 +104,8 @@
 # endif
 #else
 # if defined(VMS)
-#   include "../vmsish.h"
+#   define NO_PERL_TYPEDEFS
+#   include "vmsish.h"
 # endif
 #endif
 
@@ -105,7 +117,15 @@ char *strchr(), *strrchr();
 char *strcpy(), *strcat();
 #endif /* ! STANDARD_C */
 
-#include "handy.h"
+#ifdef VMS
+#  include "handy.h"
+#else 
+#  include "../handy.h"
+#endif
+
+#undef Nullfp
+#define Nullfp Null(FILE*)
+
 #define Nullop 0
 
 #define OPROG		1
@@ -395,6 +415,7 @@ EXT bool nomemok INIT(FALSE);
 EXT char const_FS INIT(0);
 EXT char *namelist INIT(Nullch);
 EXT char fswitch INIT(0);
+EXT bool old_awk INIT(0);
 
 EXT int saw_FS INIT(0);
 EXT int maxfld INIT(0);