diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2014-01-12 20:42:08 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2014-01-12 20:42:08 +0200 |
| commit | 624d70844fe63068132adb7c66ea3f8a231e56a7 (patch) | |
| tree | 79781e2b0e24b5e478804001c83fcde64602f502 /awk.h | |
| parent | da83b6857bf0a67b15fc75d31a0b6802ac9baffe (diff) | |
| parent | f934f2192779db0091d1706d97d1fd43cb26dc9a (diff) | |
| download | egawk-624d70844fe63068132adb7c66ea3f8a231e56a7.tar.gz egawk-624d70844fe63068132adb7c66ea3f8a231e56a7.tar.bz2 egawk-624d70844fe63068132adb7c66ea3f8a231e56a7.zip | |
Merge branch 'master' into comment
Diffstat (limited to 'awk.h')
| -rw-r--r-- | awk.h | 21 |
1 files changed, 6 insertions, 15 deletions
@@ -180,10 +180,6 @@ typedef int off_t; #define O_BINARY 0 #endif -#ifndef HAVE_VPRINTF -#error "you lose: you need a system with vfprintf" -#endif /* HAVE_VPRINTF */ - #ifndef HAVE_SETLOCALE #define setlocale(locale, val) /* nothing */ #endif /* HAVE_SETLOCALE */ @@ -213,6 +209,8 @@ typedef void *stackoverflow_context_t; /* use this as lintwarn("...") this is a hack but it gives us the right semantics */ #define lintwarn (*(set_loc(__FILE__, __LINE__),lintfunc)) +/* same thing for warning */ +#define warning (*(set_loc(__FILE__, __LINE__),r_warning)) #ifdef HAVE_MPFR #include <gmp.h> @@ -437,10 +435,10 @@ typedef struct exp_node { # define NULL_FIELD 0x4000 /* this is the null field */ /* type = Node_var_array */ -# define ARRAYMAXED 0x4000 /* array is at max size */ -# define HALFHAT 0x8000 /* half-capacity Hashed Array Tree; +# define ARRAYMAXED 0x8000 /* array is at max size */ +# define HALFHAT 0x10000 /* half-capacity Hashed Array Tree; * See cint_array.c */ -# define XARRAY 0x10000 +# define XARRAY 0x20000 } NODE; #define vname sub.nodep.name @@ -1579,7 +1577,7 @@ extern void final_exit(int status) ATTRIBUTE_NORETURN; extern void err(bool isfatal, const char *s, const char *emsg, va_list argp) ATTRIBUTE_PRINTF(3, 0); extern void msg (const char *mesg, ...) ATTRIBUTE_PRINTF_1; extern void error (const char *mesg, ...) ATTRIBUTE_PRINTF_1; -extern void warning (const char *mesg, ...) ATTRIBUTE_PRINTF_1; +extern void r_warning (const char *mesg, ...) ATTRIBUTE_PRINTF_1; extern void set_loc (const char *file, int line); extern void r_fatal (const char *mesg, ...) ATTRIBUTE_PRINTF_1; #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2) @@ -1661,13 +1659,6 @@ extern NODE **function_list(bool sort); extern void print_vars(NODE **table, Func_print print_func, FILE *fp); /* floatcomp.c */ -#ifdef VMS /* VMS linker weirdness? */ -#define Ceil gawk_ceil -#define Floor gawk_floor -#endif - -extern AWKNUM Floor(AWKNUM n); -extern AWKNUM Ceil(AWKNUM n); #ifdef HAVE_UINTMAX_T extern uintmax_t adjust_uint(uintmax_t n); #else |