X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=x2p%2Fa2p.h;h=35a2a439d5359fc6b2703ab420b2d546c655ffd6;hb=a4d60858fc3c717ec83cbdceb029a69fc535e3f8;hp=a7cbcb68b341cf34757b00f4deda1edbf38469c7;hpb=d07c2202867c84a305417e42e522ca39d055c62a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/x2p/a2p.h b/x2p/a2p.h
index a7cbcb6..35a2a43 100644
--- a/x2p/a2p.h
+++ b/x2p/a2p.h
@@ -1,6 +1,7 @@
 /* $RCSfile: a2p.h,v $$Revision: 4.1 $$Date: 92/08/07 18:29:09 $
  *
- *    Copyright (c) 1991-1997, Larry Wall
+ *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ *    2000, 2001, 2002, by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
@@ -16,10 +17,16 @@
 
 #ifdef VMS
 #  include "config.h"
+#elif defined(NETWARE)
+#  include "../NetWare/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
@@ -40,10 +47,6 @@
 #  endif
 #endif
 
-#if defined(__STDC__) || defined(vax11c) || defined(_AIX) || defined(__stdc__) || defined(__cplusplus)
-# define STANDARD_C 1
-#endif
-
 /* Use all the "standard" definitions? */
 #if defined(STANDARD_C) && defined(I_STDLIB)
 #   include <stdlib.h>
@@ -73,13 +76,11 @@
 
 #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));
+#ifndef STANDARD_C
+    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)
@@ -88,19 +89,11 @@
 #   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
 
-
 #ifdef I_TIME
 #   include <time.h>
 #endif
@@ -123,6 +116,7 @@
 
 #ifdef DOSISH
 # if defined(OS2)
+#   define PTHX_UNUSED
 #   include "../os2ish.h"
 # else
 #   include "../dosish.h"
@@ -138,8 +132,13 @@
 /* All of these are in stdlib.h or time.h for ANSI C */
 Time_t time();
 struct tm *gmtime(), *localtime();
+#if defined(OEMVS) || defined(__OPEN_VM)
+char *(strchr)(), *(strrchr)();
+char *(strcpy)(), *(strcat)();
+#else
 char *strchr(), *strrchr();
 char *strcpy(), *strcat();
+#endif
 #endif /* ! STANDARD_C */
 
 #ifdef VMS
@@ -366,7 +365,7 @@ EXT char *No INIT("");
 
 #define str_true(str) (Str = (str), (Str->str_pok ? True(Str->str_ptr) : (Str->str_nok ? (Str->str_nval != 0.0) : 0 )))
 
-#define str_peek(str) (Str = (str), (Str->str_pok ? Str->str_ptr : (Str->str_nok ? (sprintf(buf,"num(%g)",Str->str_nval),buf) : "" )))
+#define str_peek(str) (Str = (str), (Str->str_pok ? Str->str_ptr : (Str->str_nok ? (sprintf(buf,"num(%"NVgf")",Str->str_nval),buf) : "" )))
 #define str_get(str) (Str = (str), (Str->str_pok ? Str->str_ptr : str_2ptr(Str)))
 #define str_gnum(str) (Str = (str), (Str->str_nok ? Str->str_nval : str_2num(Str)))
 EXT STR *Str;
@@ -374,27 +373,27 @@ EXT STR *Str;
 #define GROWSTR(pp,lp,len) if (*(lp) < (len)) growstr(pp,lp,len)
 
 /* Prototypes for things in a2p.c */
-int aryrefarg _(( int arg ));
-int bl _(( int arg, int maybe ));
-void dump _(( int branch ));
-int fixfargs _(( int name, int arg, int prevargs ));
-int fixrargs _(( char *name, int arg, int prevargs ));
-void fixup _(( STR *str ));
-int numary _(( int arg ));
-int oper0 _(( int type ));
-int oper1 _(( int type, int arg1 ));
-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 ));
-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 ));
-void yyerror _(( char *s ));
-int yylex _(( void ));
+int aryrefarg ( int arg );
+int bl ( int arg, int maybe );
+void dump ( int branch );
+int fixfargs ( int name, int arg, int prevargs );
+int fixrargs ( char *name, int arg, int prevargs );
+void fixup ( STR *str );
+int numary ( int arg );
+int oper0 ( int type );
+int oper1 ( int type, int arg1 );
+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 );
+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 );
+void yyerror ( char *s );
+int yylex ( void );
 
 EXT int line INIT(0);
 
@@ -412,6 +411,10 @@ EXT int debug INIT(0);
 EXT int dlevel INIT(0);
 #define YYDEBUG 1
 extern int yydebug;
+#else
+# ifndef YYDEBUG
+#  define YYDEBUG 0
+# endif
 #endif
 
 EXT STR *freestrroot INIT(Nullstr);