From 370eb57c659606b07aaaae4a2d1524f23ee74a37 Mon Sep 17 00:00:00 2001 From: Erwin Janssen Date: Tue, 12 Jul 2016 15:21:43 +0200 Subject: [PATCH] Fixed Wundef warnings in various files in sfio. The fixed header files are included in multiple locations, causing a reducution of around 2000 Wundef warnings after these changes. --- lib/sfio/sfcvt.c | 2 +- lib/sfio/sfhdr.h | 33 +++++++++++++++++---------------- lib/sfio/sfio.h | 14 +++++++------- lib/sfio/sfputd.c | 2 +- lib/sfio/sftable.c | 2 +- lib/sfio/sfvprintf.c | 14 +++++++------- lib/sfio/sfvscanf.c | 4 ++-- lib/sfio/vthread.h | 10 +++++----- 8 files changed, 41 insertions(+), 40 deletions(-) diff --git a/lib/sfio/sfcvt.c b/lib/sfio/sfcvt.c index 9ffc87c49..b3c85ee95 100644 --- a/lib/sfio/sfcvt.c +++ b/lib/sfio/sfcvt.c @@ -45,7 +45,7 @@ int format; /* conversion format */ *sign = *decpt = 0; -#if !_ast_fltmax_double +#if !defined(_ast_fltmax_double) if (format & SFFMT_LDOUBLE) { Sfdouble_t dval = *((Sfdouble_t *) dv); diff --git a/lib/sfio/sfhdr.h b/lib/sfio/sfhdr.h index 88552b0a8..0ca6b1aa3 100644 --- a/lib/sfio/sfhdr.h +++ b/lib/sfio/sfhdr.h @@ -49,11 +49,12 @@ extern "C" { #else /*!defined(_PACKAGE_ast) */ -#if __mips == 2 && !defined(_NO_LARGEFILE64_SOURCE) +#if defined(__mips) && __mips == 2 && !defined(_NO_LARGEFILE64_SOURCE) #define _NO_LARGEFILE64_SOURCE 1 #endif #if !defined(_NO_LARGEFILE64_SOURCE) && \ - _lib_lseek64 && _lib_stat64 && _lib_mmap64 && _typ_off64_t && _typ_struct_stat64 + _lib_lseek64 && _lib_stat64 && _lib_mmap64 && defined(_typ_off64_t) && \ + _typ_struct_stat64 # if !defined(_LARGEFILE64_SOURCE) # define _LARGEFILE64_SOURCE 1 # endif @@ -64,7 +65,7 @@ extern "C" { /* when building the binary compatibility package, a number of header files are not needed and they may get in the way so we remove them here. */ -#if _SFBINARY_H +#if defined(_SFBINARY_H) #undef _hdr_time #undef _sys_time #undef _sys_stat @@ -194,7 +195,7 @@ extern "C" { #endif #endif /*_lib_select_*/ -#if _lib_poll +#if defined(_lib_poll) #include #if _lib_poll_fd_1 @@ -219,10 +220,10 @@ extern "C" { /* alternative process forking */ #if _lib_vfork && !defined(fork) && !defined(sparc) && !defined(__sparc) -#if _hdr_vfork +#if defined(_hdr_vfork) #include #endif -#if _sys_vfork +#if defined(_sys_vfork) #include #endif #define fork vfork @@ -269,7 +270,7 @@ extern "C" { #endif #endif -#if !defined(SF_MAXDOUBLE) && _hdr_floatingpoint +#if !defined(SF_MAXDOUBLE) && defined(_hdr_floatingpoint) #include #if !defined(SF_MAXDOUBLE) && defined(MAXDOUBLE) #define SF_MAXDOUBLE MAXDOUBLE @@ -289,13 +290,13 @@ extern "C" { #endif #endif -#if !_ast_fltmax_double +#if !defined(_ast_fltmax_double) #if !defined(SF_MAXDOUBLE) #define SF_MAXDOUBLE 1.79769313486231570e+308 #endif -#if _lib_qfrexp && _lib_qldexp +#if defined(_lib_qfrexp) && _lib_qldexp #define _has_expfuncs 1 #define frexp qfrexp #define ldexp qldexp @@ -459,7 +460,7 @@ extern "C" { #define ESPIPE 29 #endif /* see if we can use memory mapping for io */ -#if !defined(_PACKAGE_ast) && _mmap_worthy +#if !defined(_PACKAGE_ast) && defined(_mmap_worthy) # ifdef _LARGEFILE64_SOURCE # undef mmap # endif @@ -677,7 +678,7 @@ extern "C" { #define SF_NMAP 8 /* set/unset sequential states for mmap */ -#if _lib_madvise && defined(MADV_SEQUENTIAL) && defined(MADV_NORMAL) +#if defined(_lib_madvise) && defined(MADV_SEQUENTIAL) && defined(MADV_NORMAL) #define SFMMSEQON(f,a,s) (void)(madvise((caddr_t)(a),(size_t)(s),MADV_SEQUENTIAL) ) #define SFMMSEQOFF(f,a,s) (void)(madvise((caddr_t)(a),(size_t)(s),MADV_NORMAL) ) #else @@ -836,7 +837,7 @@ extern "C" { /* floating point to ascii conversion */ #define SF_MAXEXP10 6 #define SF_MAXPOW10 (1 << SF_MAXEXP10) -#if !_ast_fltmax_double +#if !defined(_ast_fltmax_double) #define SF_FDIGITS 1024 /* max allowed fractional digits */ #define SF_IDIGITS (8*1024) /* max number of digits in int part */ #else @@ -995,7 +996,7 @@ extern "C" { #endif #endif -#if !_hdr_mman && !_sys_mman +#if !defined(_hdr_mman) && !_sys_mman extern Void_t *mmap _ARG_((Void_t *, size_t, int, int, int, off_t)); extern int munmap _ARG_((Void_t *, size_t)); #endif @@ -1073,11 +1074,11 @@ extern "C" { extern int fstat _ARG_((int, Stat_t *)); #endif -#if _lib_vfork && !_hdr_vfork && !_sys_vfork +#if _lib_vfork && !defined(_hdr_vfork) && !defined(_sys_vfork) extern pid_t vfork _ARG_((void)); #endif /*_lib_vfork*/ -#if _lib_poll +#if defined(_lib_poll) #if _lib_poll_fd_1 extern int poll _ARG_((struct pollfd *, ulong, int)); #else @@ -1085,7 +1086,7 @@ extern "C" { #endif #endif /*_lib_poll*/ -#if _proto_open && __cplusplus +#if _proto_open && defined(__cplusplus) extern int open _ARG_((const char *, int, ...)); #endif diff --git a/lib/sfio/sfio.h b/lib/sfio/sfio.h index 52f05503d..04fdb4bc2 100644 --- a/lib/sfio/sfio.h +++ b/lib/sfio/sfio.h @@ -214,7 +214,7 @@ extern "C" { #define SF_STRING 0000004 /* a string stream */ #define SF_APPENDWR 0000010 /* file is in append mode only. */ -#if !_mac_SF_APPEND +#if defined(_mac_SF_APPEND) && !_mac_SF_APPEND #define SF_APPEND SF_APPENDWR /* this was the original append bit */ /* but BSDI stat.h now uses this symbol. */ /* So we leave it out in such cases. */ @@ -246,7 +246,7 @@ extern "C" { #define SF_SEEK 3 /* seek error */ #define SF_CLOSING 4 /* stream is about to be closed. */ -#if !_mac_SF_CLOSE +#if defined(_mac_SF_CLOSE) && !_mac_SF_CLOSE #define SF_CLOSE SF_CLOSING /* this was the original close event */ /* but AIX now uses this symbol. So we */ /* avoid defining it in such cases. */ @@ -277,7 +277,7 @@ extern "C" { _BEGIN_EXTERNS_ extern ssize_t _Sfi; -#if _BLD_sfio && defined(GVDLL) +#if defined(_BLD_sfio) && defined(GVDLL) #define extern __declspec(dllexport) #endif /* standard in/out/err streams */ @@ -289,7 +289,7 @@ extern "C" { extern Sfio_t _Sfstderr; #undef extern -#if _DLL && _DLL_INDIRECT_DATA +#if defined(_DLL) && defined(_DLL_INDIRECT_DATA) /* The Uwin shared library environment requires these to be defined in a global structure set up by the Uwin start-up procedure. */ @@ -298,7 +298,7 @@ extern "C" { #define sfstderr ((Sfio_t*)_ast_dll->_ast_stderr) #endif -#if _BLD_sfio && defined(__EXPORT__) +#if defined(_BLD_sfio) && defined(__EXPORT__) #define extern __EXPORT__ #endif @@ -403,7 +403,7 @@ extern "C" { #define SF_U2 (SF_U1*SF_U1) #define SF_U3 (SF_U2*SF_U1) #define SF_U4 (SF_U3*SF_U1) -#if __cplusplus +#if defined(__cplusplus) #define _SF_(f) (f) #else #define _SF_(f) ((Sfio_t*)(f)) @@ -428,7 +428,7 @@ extern "C" { #define __sf_stacked(f) ((f) ? (_SF_(f)->push != (Sfio_t*)0) : 0) #define __sf_value(f) ((f) ? (_SF_(f)->val) : 0) #define __sf_slen() (_Sfi) -#if defined(__INLINE__) && !_BLD_sfio +#if defined(__INLINE__) && !defined(_BLD_sfio) __INLINE__ int sfputd(Sfio_t * f, Sfdouble_t v) { return __sf_putd(f, v); } __INLINE__ int sfputl(Sfio_t * f, Sflong_t v) { diff --git a/lib/sfio/sfputd.c b/lib/sfio/sfputd.c index bbd5aec88..8ed56ab34 100644 --- a/lib/sfio/sfputd.c +++ b/lib/sfio/sfputd.c @@ -46,7 +46,7 @@ Sfdouble_t v; } else n = 0; -#if !_ast_fltmax_double /* don't know how to do these yet */ +#if !defined(_ast_fltmax_double) /* don't know how to do these yet */ if (v > SF_MAXDOUBLE && !_has_expfuncs) { SFOPEN(f, 0); SFMTXRETURN(f, -1); diff --git a/lib/sfio/sftable.c b/lib/sfio/sftable.c index 55d0f31ab..7c38f11e1 100644 --- a/lib/sfio/sftable.c +++ b/lib/sfio/sftable.c @@ -378,7 +378,7 @@ int type; fp[n].argv.i = va_arg(args, int); break; case SFFMT_FLOAT: -#if !_ast_fltmax_double +#if !defined(_ast_fltmax_double) if (FMTCMP(size, Sfdouble_t, Sfdouble_t)) fp[n].argv.ld = va_arg(args, Sfdouble_t); else diff --git a/lib/sfio/sfvprintf.c b/lib/sfio/sfvprintf.c index 520cd6f48..c0c482c40 100644 --- a/lib/sfio/sfvprintf.c +++ b/lib/sfio/sfvprintf.c @@ -42,7 +42,7 @@ va_list args; /* arg list if !argf */ int sign, decpt; ssize_t size; double dval; -#if !_ast_fltmax_double +#if !defined(_ast_fltmax_double) Sfdouble_t ldval; #endif char *tls[2], **ls; /* for %..[separ]s */ @@ -434,7 +434,7 @@ va_list args; /* arg list if !argf */ argv.i = va_arg(args, int); break; case SFFMT_FLOAT: -#if !_ast_fltmax_double +#if !defined(_ast_fltmax_double) if (FMTCMP(size, Sfdouble_t, Sfdouble_t)) argv.ld = va_arg(args, Sfdouble_t); else @@ -786,7 +786,7 @@ va_list args; /* arg list if !argf */ case 'e': case 'E': case 'f': -#if !_ast_fltmax_double +#if !defined(_ast_fltmax_double) if (FMTCMP(size, Sfdouble_t, Sfdouble_t)) ldval = argv.ld; else @@ -799,7 +799,7 @@ va_list args; /* arg list if !argf */ if (fmt == 'e' || fmt == 'E') { n = (precis = precis < 0 ? FPRECIS : precis) + 1; -#if !_ast_fltmax_double +#if !defined(_ast_fltmax_double) if (FMTCMP(size, Sfdouble_t, Sfdouble_t)) { ep = _sfcvt(&ldval, min(n, SF_FDIGITS), &decpt, &sign, @@ -813,7 +813,7 @@ va_list args; /* arg list if !argf */ goto e_format; } else if (fmt == 'f' || fmt == 'F') { precis = precis < 0 ? FPRECIS : precis; -#if !_ast_fltmax_double +#if !defined(_ast_fltmax_double) if (FMTCMP(size, Sfdouble_t, Sfdouble_t)) { ep = _sfcvt(&ldval, min(precis, SF_FDIGITS), &decpt, &sign, SFFMT_LDOUBLE); @@ -828,7 +828,7 @@ va_list args; /* arg list if !argf */ /* 'g' or 'G' format */ precis = precis < 0 ? FPRECIS : precis == 0 ? 1 : precis; -#if !_ast_fltmax_double +#if !defined(_ast_fltmax_double) if (FMTCMP(size, Sfdouble_t, Sfdouble_t)) { ep = _sfcvt(&ldval, min(precis, SF_FDIGITS), &decpt, &sign, SFFMT_EFORMAT | SFFMT_LDOUBLE); @@ -879,7 +879,7 @@ va_list args; /* arg list if !argf */ /* build the exponent */ ep = endep = buf + (sizeof(buf) - 1); -#if !_ast_fltmax_double +#if !defined(_ast_fltmax_double) if (FMTCMP(size, Sfdouble_t, Sfdouble_t)) dval = ldval ? 1. : 0.; /* so the below test works */ #endif diff --git a/lib/sfio/sfvscanf.c b/lib/sfio/sfvscanf.c index ea19a2b8b..54e3f66c2 100644 --- a/lib/sfio/sfvscanf.c +++ b/lib/sfio/sfvscanf.c @@ -549,7 +549,7 @@ va_list args; if (value) { *val = '\0'; -#if !_ast_fltmax_double +#if !defined(_ast_fltmax_double) if (FMTCMP(size, Sfdouble_t, Sfdouble_t)) argv.ld = _sfstrtod(accept, NIL(char **)); else @@ -559,7 +559,7 @@ va_list args; if (value) { n_assign += 1; -#if !_ast_fltmax_double +#if !defined(_ast_fltmax_double) if (FMTCMP(size, Sfdouble_t, Sfdouble_t)) *((Sfdouble_t *) value) = argv.ld; else diff --git a/lib/sfio/vthread.h b/lib/sfio/vthread.h index 1709ac066..33a033c2a 100644 --- a/lib/sfio/vthread.h +++ b/lib/sfio/vthread.h @@ -44,7 +44,7 @@ extern "C" { #undef vt_threaded #undef _may_use_threads -#if _may_use_threads && !defined(vt_threaded) && _hdr_pthread +#if defined(_may_use_threads) && !defined(vt_threaded) && defined(_hdr_pthread) #define vt_threaded 1 #include typedef pthread_mutex_t _vtmtx_t; @@ -59,7 +59,7 @@ extern "C" { #endif -#if _may_use_threads && !defined(vt_threaded) && _WIN32 +#if defined(_may_use_threads) && !defined(vt_threaded) && defined(_WIN32) #define vt_threaded 1 #include typedef CRITICAL_SECTION _vtmtx_t; @@ -123,7 +123,7 @@ extern "C" { extern int vtonceerror _ARG_((Vtonce_t *)); _END_EXTERNS_ -#if vt_threaded +#if defined(vt_threaded) && vt_threaded /* mutex structure */ struct _vtmutex_s { _vtmtx_t lock; @@ -151,7 +151,7 @@ extern "C" { int error; }; -#if _WIN32 +#if defined(_WIN32) #define VTONCE_INITDATA {0, 0} #else #define VTONCE_INITDATA {0, PTHREAD_ONCE_INIT } @@ -165,7 +165,7 @@ extern "C" { #endif /*vt_threaded */ /* fake structures and functions */ -#if !vt_threaded +#if defined(vt_threaded) && !vt_threaded struct _vtmutex_s { int error; }; -- 2.40.0