diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1998-05-29 07:22:51 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-05-29 07:22:51 +0000 |
| commit | d0340efeaf607d2e70273b4fa22e5ee3b358abe8 (patch) | |
| tree | 8187e35c8e61d21279785c869e1a5d92009e8e57 /x2p | |
| parent | ab39fa9dbf3b1a1fb7beb555653d0558a089397f (diff) | |
| parent | a1737d5b9df80320e5be59ab8fa7c96455d6b5bf (diff) | |
| download | perl-d0340efeaf607d2e70273b4fa22e5ee3b358abe8.tar.gz | |
[asperl] integrate mainline changes
p4raw-id: //depot/asperl@1055
Diffstat (limited to 'x2p')
| -rw-r--r-- | x2p/util.c | 31 | ||||
| -rw-r--r-- | x2p/util.h | 6 |
2 files changed, 4 insertions, 33 deletions
diff --git a/x2p/util.c b/x2p/util.c index 0c6f99f795..364dfe94fa 100644 --- a/x2p/util.c +++ b/x2p/util.c @@ -13,9 +13,7 @@ #include "INTERN.h" #include "util.h" -#ifdef I_STDARG -# include <stdarg.h> -#endif +#include <stdarg.h> #define FLUSH static char nomem[] = "Out of memory!\n"; @@ -178,16 +176,9 @@ growstr(char **strptr, int *curlen, int newlen) } void -#if defined(I_STDARG) && defined(HAS_VPRINTF) croak(char *pat,...) -#else /* I_STDARG */ -/*VARARGS1*/ -croak(pat,a1,a2,a3,a4) - char *pat; - int a1,a2,a3,a4; -#endif /* I_STDARG */ { -#if defined(I_STDARG) && defined(HAS_VPRINTF) +#if defined(HAS_VPRINTF) va_list args; va_start(args, pat); @@ -199,16 +190,9 @@ croak(pat,a1,a2,a3,a4) } void -#if defined(I_STDARG) && defined(HAS_VPRINTF) fatal(char *pat,...) -#else /* I_STDARG */ -/*VARARGS1*/ -fatal(pat,a1,a2,a3,a4) - char *pat; - int a1,a2,a3,a4; -#endif /* I_STDARG */ { -#if defined(I_STDARG) && defined(HAS_VPRINTF) +#if defined(HAS_VPRINTF) va_list args; va_start(args, pat); @@ -220,16 +204,9 @@ fatal(pat,a1,a2,a3,a4) } void -#if defined(I_STDARG) && defined(HAS_VPRINTF) warn(char *pat,...) -#else /* I_STDARG */ -/*VARARGS1*/ -warn(pat,a1,a2,a3,a4) - char *pat; - int a1,a2,a3,a4; -#endif /* I_STDARG */ { -#if defined(I_STDARG) && defined(HAS_VPRINTF) +#if defined(HAS_VPRINTF) va_list args; va_start(args, pat); diff --git a/x2p/util.h b/x2p/util.h index ff93e8ac7a..aa31bea217 100644 --- a/x2p/util.h +++ b/x2p/util.h @@ -28,15 +28,9 @@ void growstr _(( char **strptr, int *curlen, int newlen )); char * instr _(( char *big, char *little )); char * safecpy _(( char *to, char *from, int len )); char * savestr _(( char *str )); -#if defined(I_STDARG) && defined(HAS_VPRINTF) void croak _(( char *pat, ... )); void fatal _(( char *pat, ... )); void warn _(( char *pat, ... )); -#else /* defined(I_STDARG) && defined(HAS_VPRINTF) */ -void croak _(( char *pat, int a1, int a2, int a3, int a4 )); -void Myfatal (); -void warn (); -#endif /* defined(I_STDARG) && defined(HAS_VPRINTF) */ int prewalk _(( int numit, int level, int node, int *numericptr )); Malloc_t safemalloc _((MEM_SIZE nbytes)); |