diff --git a/CHANGES b/CHANGES index 38288d6..85619a7 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,8 @@ The following are the changes from calc version 2.14.0.11 to date: Fixed a number of typos. + Drop support for SunOS, IRIX and MINGW32_NT-5.0 targets. + The following are the changes from calc version 2.14.0.9 to 2.14.0.10: diff --git a/Makefile.ship b/Makefile.ship index e5533b3..3334de4 100644 --- a/Makefile.ship +++ b/Makefile.ship @@ -1176,9 +1176,7 @@ LD_DEBUG= # the ${CALC_ENV} is used to supply the proper environment variables # to calc. Most people will simply need 'CALCPATH=./cal' to ensure # that these debug rules will only use calc resource files under the -# local source directory. The longer lines (with MALLOC_VERBOSE=1 ...) -# are useful for SGI IRIX people who have 'WorkShop Performance Tools' -# and who also set 'LD_DEBUG= -lmalloc_cv' above. +# local source directory. # # If in doubt, use: # @@ -1186,13 +1184,6 @@ LD_DEBUG= # CALC_ENV= CALCPATH=./cal LD_LIBRARY_PATH=. DYLD_LIBRARY_PATH=. CALCHELP=./help \ CALCCUSTOMHELP=./custom -#CALC_ENV= CALCPATH=./cal DYLD_LIBRARY_PATH=. \ -# MALLOC_VERBOSE=1 MALLOC_TRACING=1 \ -# MALLOC_FASTCHK=1 MALLOC_FULLWARN=1 LD_LIBRARY_PATH=.:./custom -#CALC_ENV= CALCPATH=./cal DYLD_LIBRARY_PATH=. \ -# MALLOC_VERBOSE=1 MALLOC_TRACING=1 \ -# MALLOC_FASTCHK=1 MALLOC_FULLWARN=1 MALLOC_CLEAR_FREE=1 \ -# MALLOC_CLEAR_MALLOC=1 LD_LIBRARY_PATH=.:./custom # Some out of date operating systems require/want an executable to @@ -1636,58 +1627,6 @@ MAKE= gmake # endif -################ -# SunOS target # -################ - -ifeq ($(target),SunOS) -# -BLD_TYPE= calc-dynamic-only -# -CC_SHARE= -fPIC -DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib -LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ - "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" -LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -ifdef ALLOW_CUSTOM -LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -else -LIBCUSTCALC_SHLIB= -endif -# -CC_STATIC= -LIBCALC_STATIC= -LIBCUSTCALC_STATIC= -LD_STATIC= -# -# If you want to add flags to all compiler and linker -# run (via ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}), -# set ${COMMON_ADD}. -# -# For example to use gcc's -Werror to force warnings -# to become errors, call make with: -# -# make .. COMMON_ADD='-Werror' -# -# This facility requires a Gnu Makefile, or a make command -# that understands the += make operand. -# -COMMON_CFLAGS+= ${COMMON_ADD} -COMMON_LDFLAGS+= ${COMMON_ADD} -# -CCWARN= -Wall -WNO_IMPLICT= -Wno-implicit -WNO_ERROR_LONG_LONG= -Wno-error=long-long -WNO_LONG_LONG= -Wno-long-long -CCWERR= -CCOPT= ${DEBUG} -CCMISC= -# -LCC= gcc -CC= ${PURIFY} ${LCC} ${CCWERR} -# -endif - ################# # Cygwin target # ################# @@ -1791,55 +1730,6 @@ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC} #if 0 /* start of skip for non-Gnu makefiles */ endif -################################################### -# MINGW32_NT-5.0 target # -################################################### - - -ifeq ($(target),MINGW32_NT-5.0) - -EXT=.exe -TERMCONTROL= -DUSE_WIN32 -ifdef ALLOW_CUSTOM -#endif /* end of skip for non-Gnu makefiles */ -CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR};${T}${CUSTOMCALDIR} -#if 0 /* start of skip for non-Gnu makefiles */ -else -CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR} -endif -CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup -# -BLD_TYPE= calc-static-only -# -CC_SHARE= -fPIC -DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib -LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ - "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" -LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -ifdef ALLOW_CUSTOM -LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -else -LIBCUSTCALC_SHLIB= -endif -# -CC_STATIC= -DSTATIC_ONLY -LIBCALC_STATIC= -LIBCUSTCALC_STATIC= -LD_STATIC= -# -CCWARN= -Wall -WNO_IMPLICT= -Wno-implicit -WNO_ERROR_LONG_LONG= -Wno-error=long-long -WNO_LONG_LONG= -Wno-long-long -CCWERR= -CCOPT= ${DEBUG} -CCMISC= -DNOTCYGWIN -# -LCC= gcc -CC= ${PURIFY} ${LCC} ${CCWERR} -# -endif - ################################################### # default target - when no specific target exists # ################################################### diff --git a/custom/Makefile b/custom/Makefile index 6bd25fe..15ed4c7 100644 --- a/custom/Makefile +++ b/custom/Makefile @@ -913,58 +913,6 @@ MAKE= gmake # endif -################ -# SunOS target # -################ - -ifeq ($(target),SunOS) -# -BLD_TYPE= calc-dynamic-only -# -CC_SHARE= -fPIC -DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib -LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ - "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" -LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -ifdef ALLOW_CUSTOM -LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -else -LIBCUSTCALC_SHLIB= -endif -# -CC_STATIC= -LIBCALC_STATIC= -LIBCUSTCALC_STATIC= -LD_STATIC= -# -# If you want to add flags to all compiler and linker -# run (via ${COMMON_CFLAGS} and ${COMMON_LDFLAGS}), -# set ${COMMON_ADD}. -# -# For example to use gcc's -Werror to force warnings -# to become errors, call make with: -# -# make .. COMMON_ADD='-Werror' -# -# This facility requires a Gnu Makefile, or a make command -# that understands the += make operand. -# -COMMON_CFLAGS+= ${COMMON_ADD} -COMMON_LDFLAGS+= ${COMMON_ADD} -# -CCWARN= -Wall -WNO_IMPLICT= -Wno-implicit -WNO_ERROR_LONG_LONG= -Wno-error=long-long -WNO_LONG_LONG= -Wno-long-long -CCWERR= -CCOPT= ${DEBUG} -CCMISC= -# -LCC= gcc -CC= ${PURIFY} ${LCC} ${CCWERR} -# -endif - ################# # Cygwin target # ################# @@ -1068,55 +1016,6 @@ LDFLAGS= ${LD_DEBUG} ${ILDFLAGS} ${LIBCALC_STATIC} ${LIBCUSTCALC_STATIC} #if 0 /* start of skip for non-Gnu makefiles */ endif -################################################### -# MINGW32_NT-5.0 target # -################################################### - - -ifeq ($(target),MINGW32_NT-5.0) - -EXT=.exe -TERMCONTROL= -DUSE_WIN32 -ifdef ALLOW_CUSTOM -#endif /* end of skip for non-Gnu makefiles */ -CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR};${T}${CUSTOMCALDIR} -#if 0 /* start of skip for non-Gnu makefiles */ -else -CALCPATH= .;./cal;~/.cal;${T}${CALC_SHAREDIR} -endif -CALCRC= ./.calcinit;~/.calcrc;${CALC_SHAREDIR}/startup -# -BLD_TYPE= calc-static-only -# -CC_SHARE= -fPIC -DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:${PREFIX}/lib -LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \ - "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}" -LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}" -ifdef ALLOW_CUSTOM -LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}" -else -LIBCUSTCALC_SHLIB= -endif -# -CC_STATIC= -DSTATIC_ONLY -LIBCALC_STATIC= -LIBCUSTCALC_STATIC= -LD_STATIC= -# -CCWARN= -Wall -WNO_IMPLICT= -Wno-implicit -WNO_ERROR_LONG_LONG= -Wno-error=long-long -WNO_LONG_LONG= -Wno-long-long -CCWERR= -CCOPT= ${DEBUG} -CCMISC= -DNOTCYGWIN -# -LCC= gcc -CC= ${PURIFY} ${LCC} ${CCWERR} -# -endif - ################################################### # default target - when no specific target exists # ################################################### diff --git a/value.c b/value.c index 8c78383..f21348c 100644 --- a/value.c +++ b/value.c @@ -2360,7 +2360,7 @@ testvalue(VALUE *vp) case V_FILE: return validid(vp->v_file); case V_NULL: - break; /* hack to get gcc on SunOS to be quiet */ + break; case V_OBJ: val = objcall(OBJ_TEST, vp, NULL_VALUE, NULL_VALUE); return (val.v_int != 0); @@ -2385,7 +2385,6 @@ testvalue(VALUE *vp) default: return TRUE; } - /* hack to get gcc on SunOS to be quiet */ return FALSE; }