diff --git a/ase/awk/run.c b/ase/awk/run.c index ddf44176..62c9c2c3 100644 --- a/ase/awk/run.c +++ b/ase/awk/run.c @@ -1,5 +1,5 @@ /* - * $Id: run.c,v 1.275 2006-11-19 14:55:20 bacon Exp $ + * $Id: run.c,v 1.276 2006-11-19 15:08:13 bacon Exp $ */ #include @@ -24,7 +24,7 @@ enum exit_level_t EXIT_FUNCTION, EXIT_NEXT, EXIT_GLOBAL, - EXIT_ABORT, + EXIT_ABORT }; #define PANIC(run,code) \ @@ -5388,8 +5388,8 @@ run->awk->syscas.dprintf (ASE_T("len = %d str=[%s]\n"), static int __shorten_record (ase_awk_run_t* run, ase_size_t nflds) { - ase_awk_val_t* v = ASE_NULL; - ase_char_t* ofs_free = ASE_NULL, * ofs = ASE_NULL; + ase_awk_val_t* v; + ase_char_t* ofs_free = ASE_NULL, * ofs; ase_size_t ofs_len, i; ase_awk_str_t tmp; diff --git a/ase/awk/val.c b/ase/awk/val.c index 60cd6e8e..5454937f 100644 --- a/ase/awk/val.c +++ b/ase/awk/val.c @@ -1,5 +1,5 @@ /* - * $Id: val.c,v 1.90 2006-11-18 15:36:57 bacon Exp $ + * $Id: val.c,v 1.91 2006-11-19 15:08:13 bacon Exp $ */ #include @@ -726,15 +726,20 @@ void ase_awk_dprintval (ase_awk_run_t* run, ase_awk_val_t* val) break; case ASE_AWK_VAL_INT: - #if defined(__BORLANDC__) || defined(_MSC_VER) - __DPRINTF (ASE_T("%I64d"), - (__int64)((ase_awk_nde_int_t*)val)->val); - #elif defined(vax) || defined(__vax) || defined(_SCO_DS) - __DPRINTF (ASE_T("%ld"), - (long)((ase_awk_val_int_t*)val)->val); - #else + #if ASE_SIZEOF_LONG_LONG > 0 __DPRINTF (ASE_T("%lld"), (long long)((ase_awk_val_int_t*)val)->val); + #elif ASE_SIZEOF___INT64 > 0 + __DPRINTF (ASE_T("%I64d"), + (__int64)((ase_awk_nde_int_t*)val)->val); + #elif ASE_SIZEOF_LONG > 0 + __DPRINTF (ASE_T("%ld"), + (long)((ase_awk_val_int_t*)val)->val); + #elif ASE_SIZEOF_INT > 0 + __DPRINTF (ASE_T("%d"), + (int)((ase_awk_val_int_t*)val)->val); + #else + #error unsupported integer size #endif break;