update Changes

[p5sagit/p5-mst-13.2.git] / x2p / a2p.h

diff --git a/x2p/a2p.h b/x2p/a2p.h
index 54a918c..2db5f36 100644 (file)
--- 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.
@@ -9,45 +9,148 @@
  */
 
 #define VOIDUSED 1
-#include "../config.h"
 
-#ifndef HAS_BCOPY
-#   define bcopy(s1,s2,l) memcpy(s2,s1,l)
+#ifdef WIN32
+#define _INC_WIN32_PERL5       /* kludge around win32 stdio layer */
 #endif
-#ifndef HAS_BZERO
-#   define bzero(s,l) memset(s,0,l)
+
+#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
+#endif
+
+#ifdef WIN32
+#undef USE_STDIO_PTR           /* XXX fast gets won't work, must investigate */
+#  ifndef STANDARD_C
+#    define STANDARD_C
+#  endif
+#  if defined(__BORLANDC__)
+#    pragma warn -ccc
+#    pragma warn -rch
+#    pragma warn -sig
+#    pragma warn -pia
+#    pragma warn -par
+#    pragma warn -aus
+#    pragma warn -use
+#    pragma warn -csu
+#    pragma warn -pro
+#  elif defined(_MSC_VER)
+#  elif defined(__MINGW32__)
+#  endif
 #endif
 
 /* Use all the "standard" definitions? */
 #if defined(STANDARD_C) && defined(I_STDLIB)
 #   include <stdlib.h>
 #endif /* STANDARD_C */
+
 #include <stdio.h>
 
 #ifdef I_MATH
 #include <math.h>
 #endif
 
-#ifdef USE_NEXT_CTYPE 
+#ifdef I_SYS_TYPES
+#  include <sys/types.h>
+#endif
+
+#ifdef USE_NEXT_CTYPE
+
+#if NX_CURRENT_COMPILER_RELEASE >= 400
+#include <objc/NXCType.h>
+#else /*  NX_CURRENT_COMPILER_RELEASE < 400 */
 #include <appkit/NXCType.h>
-#else
+#endif /*  NX_CURRENT_COMPILER_RELEASE >= 400 */
+
+#else /* !USE_NEXT_CTYPE */
 #include <ctype.h>
-#endif
+#endif /* USE_NEXT_CTYPE */
 
 #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
 #   include <strings.h>
 #endif
 
+#if !defined(HAS_BCOPY) || defined(__cplusplus)
+#   define bcopy(s1,s2,l) memcpy(s2,s1,l)
+#endif
+#if !defined(HAS_BZERO) || defined(__cplusplus)
+#   define bzero(s,l) memset(s,0,l)
+#endif
+
 #if !defined(HAS_STRCHR) && defined(HAS_INDEX) && !defined(strchr)
 #define strchr index
 #define strrchr rindex
 #endif
 
-#include "handy.h"
+
+#ifdef I_TIME
+#   include <time.h>
+#endif
+
+#ifdef I_SYS_TIME
+#   ifdef I_SYS_TIME_KERNEL
+#      define KERNEL
+#   endif
+#   include <sys/time.h>
+#   ifdef I_SYS_TIME_KERNEL
+#      undef KERNEL
+#   endif
+#endif
+
+#ifndef MSDOS
+#  if defined(HAS_TIMES) && defined(I_SYS_TIMES)
+#    include <sys/times.h>
+#  endif
+#endif
+
+#ifdef DOSISH
+# if defined(OS2)
+#   include "../os2ish.h"
+# else
+#   include "../dosish.h"
+# endif
+#else
+# if defined(VMS)
+#   define NO_PERL_TYPEDEFS
+#   include "vmsish.h"
+# endif
+#endif
+
+#ifndef STANDARD_C
+/* All of these are in stdlib.h or time.h for ANSI C */
+Time_t time();
+struct tm *gmtime(), *localtime();
+char *strchr(), *strrchr();
+char *strcpy(), *strcat();
+#endif /* ! STANDARD_C */
+
+#ifdef VMS
+#  include "handy.h"
+#else 
+#  include "../handy.h"
+#endif
+
+#undef Nullfp
+#define Nullfp Null(FILE*)
+
 #define Nullop 0
 
 #define OPROG          1
@@ -273,10 +376,10 @@ EXT STR *Str;
 /* Prototypes for things in a2p.c */
 int aryrefarg _(( int arg ));
 int bl _(( int arg, int maybe ));
-int dump _(( int branch ));
+void dump _(( int branch ));
 int fixfargs _(( int name, int arg, int prevargs ));
 int fixrargs _(( char *name, int arg, int prevargs ));
-int fixup _(( STR *str ));
+void fixup _(( STR *str ));
 int numary _(( int arg ));
 int oper0 _(( int type ));
 int oper1 _(( int type, int arg1 ));
@@ -284,13 +387,13 @@ int oper2 _(( int type, int arg1, int arg2 ));
 int oper3 _(( int type, int arg1, int arg2, int arg3 ));
 int oper4 _(( int type, int arg1, int arg2, int arg3, int arg4 ));
 int oper5 _(( int type, int arg1, int arg2, int arg3, int arg4, int arg5 ));
-int putlines _(( STR *str ));
-int putone _(( void ));
+void putlines _(( STR *str ));
+void putone _(( void ));
 int rememberargs _(( int arg ));
 char * scannum _(( char *s ));
 char * scanpat _(( char *s ));
 int string _(( char *ptr, int len ));
-int yyerror _(( char *s ));
+void yyerror _(( char *s ));
 int yylex _(( void ));
 
 EXT int line INIT(0);
@@ -337,6 +440,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);