diff --git a/CHANGES b/CHANGES
index b0f91b5..114f1b7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -16,6 +16,21 @@ The following are the changes from calc version 2.12.1.10 to date:
 
     Added Apple Mac OS X compiler set in the Makefile.
 
+    When MACOSX_TLS is defined, calc attempts to compile with OS
+    X Thread Local Storage.  As of version 2.12.1.12 this mode is
+    extremely experimental.  Calc may not compile with MACOSX_TLS defined.
+
+    Fixed E_FUNC vs EXTERN issues discovered by Mirko Viviani
+    <mirko at objectlab dot org>.
+
+    Removed include of <malloc.h>.  The building of the include file
+    "have_malloc.h" has been removed from the Makefile.  One some
+    systems such as FreeBSD, the file /usr/include/malloc.h exists
+    and contains an forced error saying that stdlib.h should be used
+    instead.  The Makefile symbol HAVE_MALLOC has been removed.
+
+    Fixed FreeBSD dereferencing type-punned pointer error in filepos2z().
+
 
 The following are the changes from calc version 2.12.1.8 to 2.12.1.9:
 
@@ -6358,8 +6373,8 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.97 $
-## @(#) $Id: CHANGES,v 29.97 2007/02/11 10:25:01 chongo Exp $
+## @(#) $Revision: 29.100 $
+## @(#) $Id: CHANGES,v 29.100 2007/02/12 08:22:13 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $
 ##
 ## Under source code control:	1993/06/02 18:12:57
diff --git a/Makefile b/Makefile
index fe4b217..2925096 100644
--- a/Makefile
+++ b/Makefile
@@ -32,8 +32,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-MAKEFILE_REV= $$Revision: 29.88 $$
-# @(#) $Id: Makefile.ship,v 29.88 2007/02/11 10:32:26 chongo Exp $
+MAKEFILE_REV= $$Revision: 29.89 $$
+# @(#) $Id: Makefile.ship,v 29.89 2007/02/12 04:19:38 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $
 #
 # Under source code control:	1990/02/15 01:48:41
@@ -424,20 +424,6 @@ ALIGN32=
 #ALIGN32= -DMUST_ALIGN32
 #ALIGN32= -UMUST_ALIGN32
 
-# Determine if we have the <malloc.h> include file.
-#
-#    HAVE_MALLOC_H=		let the Makefile look for the include file
-#    HAVE_MALLOC_H= YES		assume that the include file exists
-#    HAVE_MALLOC_H= NO		assume that the include file does not exist
-#
-# Select HAVE_MALLOC_H= YES for DJGPP.
-#
-# When in doubt, leave HAVE_MALLOC_H empty.
-#
-HAVE_MALLOC_H=
-#HAVE_MALLOC_H= YES
-#HAVE_MALLOC_H= NO
-
 # Determine if we have the <stdlib.h> include file.
 #
 #    HAVE_STDLIB_H=		let the Makefile look for the include file
@@ -1294,7 +1280,7 @@ LIB_H_SRC= alloc.h blkcpy.h block.h byteswap.h calc.h cmath.h \
 # we build these .h files during the make
 #
 BUILD_H_SRC= align32.h args.h calcerr.h conf.h endian_calc.h \
-	fposval.h have_const.h have_fpos.h have_fpos_pos.h have_malloc.h \
+	fposval.h have_const.h have_fpos.h have_fpos_pos.h \
 	have_memmv.h have_newstr.h have_offscl.h have_posscl.h \
 	have_stdlib.h have_string.h have_times.h have_uid_t.h \
 	have_unistd.h longbits.h terminal.h \
@@ -1809,44 +1795,6 @@ longbits.h: longbits${EXT} ${MAKE_FILE}
 	    ${TRUE}; \
 	fi
 
-have_malloc.h: ${MAKE_FILE}
-	-${Q} ${RM} -f have_malloc.h
-	${Q} echo 'forming have_malloc.h'
-	${Q} echo '/*' > have_malloc.h
-	${Q} echo ' * DO NOT EDIT -- generated by the Makefile' >> have_malloc.h
-	${Q} echo ' */' >> have_malloc.h
-	${Q} echo '' >> have_malloc.h
-	${Q} echo '' >> have_malloc.h
-	${Q} echo '#if !defined(__HAVE_MALLOC_H__)' >> have_malloc.h
-	${Q} echo '#define __HAVE_MALLOC_H__' >> have_malloc.h
-	${Q} echo '' >> have_malloc.h
-	${Q} echo '' >> have_malloc.h
-	${Q} echo '/* do we have <malloc.h>? */' >> have_malloc.h
-	-${Q} if [ X"${HAVE_MALLOC_H}" = X"YES" ]; then \
-	    echo '#define HAVE_MALLOC_H	 /* yes */' >> have_malloc.h; \
-	elif [ X"${HAVE_MALLOC_H}" = X"NO" ]; then \
-	    echo '#undef HAVE_MALLOC_H	/* no */' >> have_malloc.h; \
-	elif [ -f ${INCDIR}/malloc.h ]; then \
-	    echo '#define HAVE_MALLOC_H	 /* yes */' >> have_malloc.h; \
-	elif [ -f /usr/include/malloc.h ]; then \
-	    echo '#define HAVE_MALLOC_H	 /* yes */' >> have_malloc.h; \
-	else \
-	    echo '#undef HAVE_MALLOC_H	/* no */' >> have_malloc.h; \
-	fi
-	${Q} echo '' >> have_malloc.h
-	${Q} echo '' >> have_malloc.h
-	${Q} echo '#endif /* !__HAVE_MALLOC_H__ */' >> have_malloc.h
-	${Q} echo 'have_malloc.h formed'
-	-@if [ -z "${Q}" ]; then \
-	    echo ''; \
-	    echo '=-=-= start of $@ =-=-='; \
-	    ${CAT} $@; \
-	    echo '=-=-= end of $@ =-=-='; \
-	    echo ''; \
-	else \
-	    ${TRUE}; \
-	fi
-
 have_times.h: ${MAKE_FILE}
 	-${Q} ${RM} -f have_times.h
 	${Q} echo 'forming have_times.h'
@@ -3594,6 +3542,7 @@ clean:
 	-${RM} -rf lib
 	-${RM} -f endian.h stdarg.h libcalcerr.a cal/obj help/obj win32dll.h
 	-${RM} -f have_vs.c std_arg.h try_stdarg.c fnvhash.c
+	-${RM} -f have_malloc.h
 	${V} echo '=-=-=-=-= end of $@ rule =-=-=-=-='
 
 clobber:
@@ -3632,6 +3581,7 @@ clobber:
 	-${RM} -rf lib
 	-${RM} -f endian.h stdarg.h libcalcerr.a cal/obj help/obj win32dll.h
 	-${RM} -f have_vs.c std_arg.h try_stdarg.c fnvhash.c calc.spec
+	-${RM} -f have_malloc.h
 	-${RM} -rf win32
 	${V} echo '=-=-=-=-= end of $@ rule =-=-=-=-='
 
@@ -3957,7 +3907,6 @@ addop.o: endian_calc.h
 addop.o: func.h
 addop.o: hash.h
 addop.o: have_const.h
-addop.o: have_malloc.h
 addop.o: have_memmv.h
 addop.o: have_newstr.h
 addop.o: have_stdlib.h
@@ -3989,7 +3938,6 @@ assocfunc.o: decl.h
 assocfunc.o: endian_calc.h
 assocfunc.o: hash.h
 assocfunc.o: have_const.h
-assocfunc.o: have_malloc.h
 assocfunc.o: have_memmv.h
 assocfunc.o: have_newstr.h
 assocfunc.o: have_stdlib.h
@@ -4018,7 +3966,6 @@ blkcpy.o: file.h
 blkcpy.o: hash.h
 blkcpy.o: have_const.h
 blkcpy.o: have_fpos.h
-blkcpy.o: have_malloc.h
 blkcpy.o: have_memmv.h
 blkcpy.o: have_newstr.h
 blkcpy.o: have_stdlib.h
@@ -4043,7 +3990,6 @@ block.o: decl.h
 block.o: endian_calc.h
 block.o: hash.h
 block.o: have_const.h
-block.o: have_malloc.h
 block.o: have_memmv.h
 block.o: have_newstr.h
 block.o: have_stdlib.h
@@ -4064,7 +4010,6 @@ byteswap.o: cmath.h
 byteswap.o: decl.h
 byteswap.o: endian_calc.h
 byteswap.o: have_const.h
-byteswap.o: have_malloc.h
 byteswap.o: have_memmv.h
 byteswap.o: have_newstr.h
 byteswap.o: have_stdlib.h
@@ -4088,7 +4033,6 @@ calc.o: endian_calc.h
 calc.o: func.h
 calc.o: hash.h
 calc.o: have_const.h
-calc.o: have_malloc.h
 calc.o: have_memmv.h
 calc.o: have_newstr.h
 calc.o: have_stdlib.h
@@ -4129,7 +4073,6 @@ codegen.o: endian_calc.h
 codegen.o: func.h
 codegen.o: hash.h
 codegen.o: have_const.h
-codegen.o: have_malloc.h
 codegen.o: have_memmv.h
 codegen.o: have_newstr.h
 codegen.o: have_stdlib.h
@@ -4156,7 +4099,6 @@ comfunc.o: config.h
 comfunc.o: decl.h
 comfunc.o: endian_calc.h
 comfunc.o: have_const.h
-comfunc.o: have_malloc.h
 comfunc.o: have_memmv.h
 comfunc.o: have_newstr.h
 comfunc.o: have_stdlib.h
@@ -4172,7 +4114,6 @@ commath.o: commath.c
 commath.o: decl.h
 commath.o: endian_calc.h
 commath.o: have_const.h
-commath.o: have_malloc.h
 commath.o: have_memmv.h
 commath.o: have_newstr.h
 commath.o: have_stdlib.h
@@ -4193,7 +4134,6 @@ config.o: decl.h
 config.o: endian_calc.h
 config.o: hash.h
 config.o: have_const.h
-config.o: have_malloc.h
 config.o: have_memmv.h
 config.o: have_newstr.h
 config.o: have_stdlib.h
@@ -4223,7 +4163,6 @@ const.o: decl.h
 const.o: endian_calc.h
 const.o: hash.h
 const.o: have_const.h
-const.o: have_malloc.h
 const.o: have_memmv.h
 const.o: have_newstr.h
 const.o: have_stdlib.h
@@ -4250,7 +4189,6 @@ custom.o: decl.h
 custom.o: endian_calc.h
 custom.o: hash.h
 custom.o: have_const.h
-custom.o: have_malloc.h
 custom.o: have_memmv.h
 custom.o: have_newstr.h
 custom.o: have_stdlib.h
@@ -4283,7 +4221,6 @@ file.o: hash.h
 file.o: have_const.h
 file.o: have_fpos.h
 file.o: have_fpos_pos.h
-file.o: have_malloc.h
 file.o: have_memmv.h
 file.o: have_newstr.h
 file.o: have_stdlib.h
@@ -4320,7 +4257,6 @@ func.o: func.h
 func.o: hash.h
 func.o: have_const.h
 func.o: have_fpos.h
-func.o: have_malloc.h
 func.o: have_memmv.h
 func.o: have_newstr.h
 func.o: have_rusage.h
@@ -4358,7 +4294,6 @@ hash.o: endian_calc.h
 hash.o: hash.c
 hash.o: hash.h
 hash.o: have_const.h
-hash.o: have_malloc.h
 hash.o: have_memmv.h
 hash.o: have_newstr.h
 hash.o: have_stdlib.h
@@ -4412,7 +4347,6 @@ help.o: decl.h
 help.o: endian_calc.h
 help.o: hash.h
 help.o: have_const.h
-help.o: have_malloc.h
 help.o: have_memmv.h
 help.o: have_newstr.h
 help.o: have_stdlib.h
@@ -4439,7 +4373,6 @@ hist.o: decl.h
 hist.o: endian_calc.h
 hist.o: hash.h
 hist.o: have_const.h
-hist.o: have_malloc.h
 hist.o: have_memmv.h
 hist.o: have_newstr.h
 hist.o: have_stdlib.h
@@ -4470,7 +4403,6 @@ input.o: decl.h
 input.o: endian_calc.h
 input.o: hash.h
 input.o: have_const.h
-input.o: have_malloc.h
 input.o: have_memmv.h
 input.o: have_newstr.h
 input.o: have_stdlib.h
@@ -4503,7 +4435,6 @@ label.o: endian_calc.h
 label.o: func.h
 label.o: hash.h
 label.o: have_const.h
-label.o: have_malloc.h
 label.o: have_memmv.h
 label.o: have_newstr.h
 label.o: have_stdlib.h
@@ -4534,7 +4465,6 @@ lib_calc.o: endian_calc.h
 lib_calc.o: func.h
 lib_calc.o: hash.h
 lib_calc.o: have_const.h
-lib_calc.o: have_malloc.h
 lib_calc.o: have_memmv.h
 lib_calc.o: have_newstr.h
 lib_calc.o: have_stdlib.h
@@ -4561,7 +4491,6 @@ lib_util.o: byteswap.h
 lib_util.o: decl.h
 lib_util.o: endian_calc.h
 lib_util.o: have_const.h
-lib_util.o: have_malloc.h
 lib_util.o: have_memmv.h
 lib_util.o: have_newstr.h
 lib_util.o: have_stdlib.h
@@ -4580,7 +4509,6 @@ listfunc.o: decl.h
 listfunc.o: endian_calc.h
 listfunc.o: hash.h
 listfunc.o: have_const.h
-listfunc.o: have_malloc.h
 listfunc.o: have_memmv.h
 listfunc.o: have_newstr.h
 listfunc.o: have_stdlib.h
@@ -4609,7 +4537,6 @@ matfunc.o: decl.h
 matfunc.o: endian_calc.h
 matfunc.o: hash.h
 matfunc.o: have_const.h
-matfunc.o: have_malloc.h
 matfunc.o: have_memmv.h
 matfunc.o: have_newstr.h
 matfunc.o: have_stdlib.h
@@ -4638,7 +4565,6 @@ math_error.o: decl.h
 math_error.o: endian_calc.h
 math_error.o: hash.h
 math_error.o: have_const.h
-math_error.o: have_malloc.h
 math_error.o: have_memmv.h
 math_error.o: have_newstr.h
 math_error.o: have_stdlib.h
@@ -4665,7 +4591,6 @@ md5.o: decl.h
 md5.o: endian_calc.h
 md5.o: hash.h
 md5.o: have_const.h
-md5.o: have_malloc.h
 md5.o: have_memmv.h
 md5.o: have_newstr.h
 md5.o: have_stdlib.h
@@ -4693,7 +4618,6 @@ obj.o: endian_calc.h
 obj.o: func.h
 obj.o: hash.h
 obj.o: have_const.h
-obj.o: have_malloc.h
 obj.o: have_memmv.h
 obj.o: have_newstr.h
 obj.o: have_stdlib.h
@@ -4726,7 +4650,6 @@ opcodes.o: func.h
 opcodes.o: hash.h
 opcodes.o: have_const.h
 opcodes.o: have_fpos.h
-opcodes.o: have_malloc.h
 opcodes.o: have_memmv.h
 opcodes.o: have_newstr.h
 opcodes.o: have_stdlib.h
@@ -4754,7 +4677,6 @@ pix.o: byteswap.h
 pix.o: decl.h
 pix.o: endian_calc.h
 pix.o: have_const.h
-pix.o: have_malloc.h
 pix.o: have_memmv.h
 pix.o: have_newstr.h
 pix.o: have_stdlib.h
@@ -4774,7 +4696,6 @@ poly.o: decl.h
 poly.o: endian_calc.h
 poly.o: hash.h
 poly.o: have_const.h
-poly.o: have_malloc.h
 poly.o: have_memmv.h
 poly.o: have_newstr.h
 poly.o: have_stdlib.h
@@ -4794,7 +4715,6 @@ prime.o: byteswap.h
 prime.o: decl.h
 prime.o: endian_calc.h
 prime.o: have_const.h
-prime.o: have_malloc.h
 prime.o: have_memmv.h
 prime.o: have_newstr.h
 prime.o: have_stdlib.h
@@ -4811,7 +4731,6 @@ qfunc.o: config.h
 qfunc.o: decl.h
 qfunc.o: endian_calc.h
 qfunc.o: have_const.h
-qfunc.o: have_malloc.h
 qfunc.o: have_memmv.h
 qfunc.o: have_newstr.h
 qfunc.o: have_stdlib.h
@@ -4829,7 +4748,6 @@ qio.o: config.h
 qio.o: decl.h
 qio.o: endian_calc.h
 qio.o: have_const.h
-qio.o: have_malloc.h
 qio.o: have_memmv.h
 qio.o: have_newstr.h
 qio.o: have_stdlib.h
@@ -4846,7 +4764,6 @@ qmath.o: config.h
 qmath.o: decl.h
 qmath.o: endian_calc.h
 qmath.o: have_const.h
-qmath.o: have_malloc.h
 qmath.o: have_memmv.h
 qmath.o: have_newstr.h
 qmath.o: have_stdlib.h
@@ -4862,7 +4779,6 @@ qmod.o: config.h
 qmod.o: decl.h
 qmod.o: endian_calc.h
 qmod.o: have_const.h
-qmod.o: have_malloc.h
 qmod.o: have_memmv.h
 qmod.o: have_newstr.h
 qmod.o: have_stdlib.h
@@ -4877,7 +4793,6 @@ qtrans.o: byteswap.h
 qtrans.o: decl.h
 qtrans.o: endian_calc.h
 qtrans.o: have_const.h
-qtrans.o: have_malloc.h
 qtrans.o: have_memmv.h
 qtrans.o: have_newstr.h
 qtrans.o: have_stdlib.h
@@ -4896,7 +4811,6 @@ quickhash.o: decl.h
 quickhash.o: endian_calc.h
 quickhash.o: hash.h
 quickhash.o: have_const.h
-quickhash.o: have_malloc.h
 quickhash.o: have_memmv.h
 quickhash.o: have_newstr.h
 quickhash.o: have_stdlib.h
@@ -4922,7 +4836,6 @@ seed.o: have_getpgid.h
 seed.o: have_getprid.h
 seed.o: have_getsid.h
 seed.o: have_gettime.h
-seed.o: have_malloc.h
 seed.o: have_memmv.h
 seed.o: have_newstr.h
 seed.o: have_rusage.h
@@ -4948,7 +4861,6 @@ shs.o: decl.h
 shs.o: endian_calc.h
 shs.o: hash.h
 shs.o: have_const.h
-shs.o: have_malloc.h
 shs.o: have_memmv.h
 shs.o: have_newstr.h
 shs.o: have_stdlib.h
@@ -4974,7 +4886,6 @@ shs1.o: decl.h
 shs1.o: endian_calc.h
 shs1.o: hash.h
 shs1.o: have_const.h
-shs1.o: have_malloc.h
 shs1.o: have_memmv.h
 shs1.o: have_newstr.h
 shs1.o: have_stdlib.h
@@ -4999,7 +4910,6 @@ size.o: decl.h
 size.o: endian_calc.h
 size.o: hash.h
 size.o: have_const.h
-size.o: have_malloc.h
 size.o: have_memmv.h
 size.o: have_newstr.h
 size.o: have_stdlib.h
@@ -5027,7 +4937,6 @@ string.o: decl.h
 string.o: endian_calc.h
 string.o: hash.h
 string.o: have_const.h
-string.o: have_malloc.h
 string.o: have_memmv.h
 string.o: have_newstr.h
 string.o: have_stdlib.h
@@ -5054,7 +4963,6 @@ symbol.o: endian_calc.h
 symbol.o: func.h
 symbol.o: hash.h
 symbol.o: have_const.h
-symbol.o: have_malloc.h
 symbol.o: have_memmv.h
 symbol.o: have_newstr.h
 symbol.o: have_stdlib.h
@@ -5085,7 +4993,6 @@ token.o: decl.h
 token.o: endian_calc.h
 token.o: hash.h
 token.o: have_const.h
-token.o: have_malloc.h
 token.o: have_memmv.h
 token.o: have_newstr.h
 token.o: have_stdlib.h
@@ -5116,7 +5023,6 @@ value.o: func.h
 value.o: hash.h
 value.o: have_const.h
 value.o: have_fpos.h
-value.o: have_malloc.h
 value.o: have_memmv.h
 value.o: have_newstr.h
 value.o: have_stdlib.h
@@ -5147,7 +5053,6 @@ version.o: decl.h
 version.o: endian_calc.h
 version.o: hash.h
 version.o: have_const.h
-version.o: have_malloc.h
 version.o: have_memmv.h
 version.o: have_newstr.h
 version.o: have_stdlib.h
@@ -5168,7 +5073,6 @@ zfunc.o: byteswap.h
 zfunc.o: decl.h
 zfunc.o: endian_calc.h
 zfunc.o: have_const.h
-zfunc.o: have_malloc.h
 zfunc.o: have_memmv.h
 zfunc.o: have_newstr.h
 zfunc.o: have_stdlib.h
@@ -5183,7 +5087,6 @@ zio.o: config.h
 zio.o: decl.h
 zio.o: endian_calc.h
 zio.o: have_const.h
-zio.o: have_malloc.h
 zio.o: have_memmv.h
 zio.o: have_newstr.h
 zio.o: have_stdlib.h
@@ -5198,7 +5101,6 @@ zmath.o: byteswap.h
 zmath.o: decl.h
 zmath.o: endian_calc.h
 zmath.o: have_const.h
-zmath.o: have_malloc.h
 zmath.o: have_memmv.h
 zmath.o: have_newstr.h
 zmath.o: have_stdlib.h
@@ -5212,7 +5114,6 @@ zmod.o: config.h
 zmod.o: decl.h
 zmod.o: endian_calc.h
 zmod.o: have_const.h
-zmod.o: have_malloc.h
 zmod.o: have_memmv.h
 zmod.o: have_newstr.h
 zmod.o: have_stdlib.h
@@ -5228,7 +5129,6 @@ zmul.o: config.h
 zmul.o: decl.h
 zmul.o: endian_calc.h
 zmul.o: have_const.h
-zmul.o: have_malloc.h
 zmul.o: have_memmv.h
 zmul.o: have_newstr.h
 zmul.o: have_stdlib.h
@@ -5248,7 +5148,6 @@ zprime.o: decl.h
 zprime.o: endian_calc.h
 zprime.o: hash.h
 zprime.o: have_const.h
-zprime.o: have_malloc.h
 zprime.o: have_memmv.h
 zprime.o: have_newstr.h
 zprime.o: have_stdlib.h
@@ -5276,7 +5175,6 @@ zrand.o: decl.h
 zrand.o: endian_calc.h
 zrand.o: hash.h
 zrand.o: have_const.h
-zrand.o: have_malloc.h
 zrand.o: have_memmv.h
 zrand.o: have_newstr.h
 zrand.o: have_stdlib.h
@@ -5303,7 +5201,6 @@ zrandom.o: decl.h
 zrandom.o: endian_calc.h
 zrandom.o: hash.h
 zrandom.o: have_const.h
-zrandom.o: have_malloc.h
 zrandom.o: have_memmv.h
 zrandom.o: have_newstr.h
 zrandom.o: have_stdlib.h
diff --git a/alloc.h b/alloc.h
index 4db4738..6ee4f4a 100644
--- a/alloc.h
+++ b/alloc.h
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.6 $
- * @(#) $Id: alloc.h,v 29.6 2007/02/11 10:19:14 chongo Exp $
+ * @(#) $Revision: 29.7 $
+ * @(#) $Id: alloc.h,v 29.7 2007/02/12 03:57:00 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/alloc.h,v $
  *
  * Under source code control:	1990/02/15 01:48:29
@@ -33,31 +33,15 @@
 
 
 #if defined(CALC_SRC)	/* if we are building from the calc source tree */
-# include "have_malloc.h"
 # include "have_newstr.h"
 # include "have_string.h"
 # include "have_memmv.h"
 #else
-# include <calc/have_malloc.h>
 # include <calc/have_newstr.h>
 # include <calc/have_string.h>
 # include <calc/have_memmv.h>
 #endif
 
-#ifdef HAVE_MALLOC_H
-# include <malloc.h>
-#else
-#if defined(FORCE_STDC) || (defined(__STDC__) && __STDC__ != 0) || defined(__cplusplus)
-   E_FUNC void *malloc();
-   E_FUNC void *realloc();
-   E_FUNC void free();
-# else
-   E_FUNC char *malloc();
-   E_FUNC char *realloc();
-   E_FUNC void free();
-# endif
-#endif
-
 #ifdef HAVE_STRING_H
 # include <string.h>
 
diff --git a/calc.h b/calc.h
index 1c3a973..8fe38e2 100644
--- a/calc.h
+++ b/calc.h
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.20 $
- * @(#) $Id: calc.h,v 29.20 2007/02/11 10:19:14 chongo Exp $
+ * @(#) $Revision: 29.21 $
+ * @(#) $Id: calc.h,v 29.21 2007/02/12 03:26:23 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/calc.h,v $
  *
  * Under source code control:	1990/02/15 01:48:31
@@ -229,11 +229,10 @@ EXTERN char *calcrc;	/* $CALCRC or default */
 EXTERN char *calcbindings;	/* $CALCBINDINGS or default */
 EXTERN char *home;		/* $HOME or default */
 EXTERN char *shell;		/* $SHELL or default */
-E_FUNC char *program;	/* our name (argv[0]) */
 
-E_FUNC int no_env;		/* TRUE (-e) => ignore env vars on startup */
+EXTERN int no_env;	/* TRUE (-e) => ignore env vars on startup */
 EXTERN long errmax;	/* if >= 0, error when errcount exceeds errmax */
-E_FUNC int use_old_std;	/* TRUE (-O) => use classic configuration */
+EXTERN int use_old_std;	/* TRUE (-O) => use classic configuration */
 
 EXTERN int allow_read;	/* FALSE => dont open any files for reading */
 EXTERN int allow_write; 	/* FALSE => dont open any files for writing */
diff --git a/custom/Makefile b/custom/Makefile
index d2d280c..af2e9e0 100644
--- a/custom/Makefile
+++ b/custom/Makefile
@@ -18,8 +18,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.30 $
-# @(#) $Id: Makefile,v 29.30 2007/02/11 10:22:29 chongo Exp $
+# @(#) $Revision: 29.31 $
+# @(#) $Id: Makefile,v 29.31 2007/02/12 04:19:17 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/custom/RCS/Makefile,v $
 #
 # Under source code control:	1997/03/09 02:28:54
@@ -849,7 +849,6 @@ c_argv.o: ../decl.h
 c_argv.o: ../endian_calc.h
 c_argv.o: ../hash.h
 c_argv.o: ../have_const.h
-c_argv.o: ../have_malloc.h
 c_argv.o: ../have_memmv.h
 c_argv.o: ../have_newstr.h
 c_argv.o: ../have_stdlib.h
@@ -876,7 +875,6 @@ c_devnull.o: ../decl.h
 c_devnull.o: ../endian_calc.h
 c_devnull.o: ../hash.h
 c_devnull.o: ../have_const.h
-c_devnull.o: ../have_malloc.h
 c_devnull.o: ../have_memmv.h
 c_devnull.o: ../have_newstr.h
 c_devnull.o: ../have_stdlib.h
@@ -903,7 +901,6 @@ c_help.o: ../decl.h
 c_help.o: ../endian_calc.h
 c_help.o: ../hash.h
 c_help.o: ../have_const.h
-c_help.o: ../have_malloc.h
 c_help.o: ../have_memmv.h
 c_help.o: ../have_newstr.h
 c_help.o: ../have_stdlib.h
@@ -930,7 +927,6 @@ c_pmodm127.o: ../decl.h
 c_pmodm127.o: ../endian_calc.h
 c_pmodm127.o: ../hash.h
 c_pmodm127.o: ../have_const.h
-c_pmodm127.o: ../have_malloc.h
 c_pmodm127.o: ../have_memmv.h
 c_pmodm127.o: ../have_newstr.h
 c_pmodm127.o: ../have_stdlib.h
@@ -957,7 +953,6 @@ c_pzasusb8.o: ../decl.h
 c_pzasusb8.o: ../endian_calc.h
 c_pzasusb8.o: ../hash.h
 c_pzasusb8.o: ../have_const.h
-c_pzasusb8.o: ../have_malloc.h
 c_pzasusb8.o: ../have_memmv.h
 c_pzasusb8.o: ../have_newstr.h
 c_pzasusb8.o: ../have_stdlib.h
@@ -987,7 +982,6 @@ c_sysinfo.o: ../endian_calc.h
 c_sysinfo.o: ../fposval.h
 c_sysinfo.o: ../hash.h
 c_sysinfo.o: ../have_const.h
-c_sysinfo.o: ../have_malloc.h
 c_sysinfo.o: ../have_memmv.h
 c_sysinfo.o: ../have_newstr.h
 c_sysinfo.o: ../have_stdlib.h
@@ -1018,7 +1012,6 @@ custtbl.o: ../decl.h
 custtbl.o: ../endian_calc.h
 custtbl.o: ../hash.h
 custtbl.o: ../have_const.h
-custtbl.o: ../have_malloc.h
 custtbl.o: ../have_memmv.h
 custtbl.o: ../have_newstr.h
 custtbl.o: ../have_stdlib.h
diff --git a/decl.h b/decl.h
index cbf0704..a94efdb 100644
--- a/decl.h
+++ b/decl.h
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.2 $
- * @(#) $Id: decl.h,v 29.2 2007/02/11 10:19:14 chongo Exp $
+ * @(#) $Revision: 29.4 $
+ * @(#) $Id: decl.h,v 29.4 2007/02/12 03:38:42 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/decl.h,v $
  *
  * Under source code control:	2007/02/09 05:24:25
@@ -38,7 +38,10 @@
 
 
 /*
- * Mac OS X macros that promote thread safety
+ * Mac OS X Thread Local Storage macros
+ *
+ * NOTE: The use of -DMACOSX_TLS is extremely experimental.  Calc may not
+ *	 compile with MACOSX_TLS defined.
  */
 #if defined(MACOSX_TLS)
 
diff --git a/file.c b/file.c
index 8dd2819..922eba9 100644
--- a/file.c
+++ b/file.c
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.17 $
- * @(#) $Id: file.c,v 29.17 2007/02/11 10:19:14 chongo Exp $
+ * @(#) $Revision: 29.18 $
+ * @(#) $Id: file.c,v 29.18 2007/02/12 08:20:24 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/file.c,v $
  *
  * Under source code control:	1991/07/20 00:21:56
@@ -1363,7 +1363,7 @@ filepos2z(FILEPOS pos)
 	ret.len = FILEPOS_BITS/BASEB;
 	ret.v = alloc(ret.len);
 	zclearval(ret);
-	SWAP_HALF_IN_FILEPOS(ret.v, (HALF *)&pos);
+	SWAP_HALF_IN_FILEPOS(ret.v, &pos);
 	ret.sign = 0;
 	ztrim(&ret);
 
diff --git a/func.h b/func.h
index 00e802a..c3b6576 100644
--- a/func.h
+++ b/func.h
@@ -17,8 +17,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.5 $
- * @(#) $Id: func.h,v 29.5 2007/02/11 10:19:14 chongo Exp $
+ * @(#) $Revision: 29.6 $
+ * @(#) $Id: func.h,v 29.6 2007/02/12 03:40:06 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/func.h,v $
  *
  * Under source code control:	1990/02/15 01:48:33
@@ -72,7 +72,7 @@ struct func {
 /*
  * The current function being compiled.
  */
-EXTERN FUNC *curfunc;
+E_FUNC FUNC *curfunc;	/* NOTE: This is a function pointer, we need E_FUNC */
 
 
 /*
diff --git a/sample/Makefile b/sample/Makefile
index 0a8c09f..c0fb7ca 100644
--- a/sample/Makefile
+++ b/sample/Makefile
@@ -17,8 +17,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-# @(#) $Revision: 29.24 $
-# @(#) $Id: Makefile,v 29.24 2007/02/11 10:22:29 chongo Exp $
+# @(#) $Revision: 29.25 $
+# @(#) $Id: Makefile,v 29.25 2007/02/12 04:19:17 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/sample/RCS/Makefile,v $
 #
 # Under source code control:	1997/04/19 22:46:49
@@ -622,7 +622,6 @@ many_random.o: ../decl.h
 many_random.o: ../endian_calc.h
 many_random.o: ../hash.h
 many_random.o: ../have_const.h
-many_random.o: ../have_malloc.h
 many_random.o: ../have_memmv.h
 many_random.o: ../have_newstr.h
 many_random.o: ../have_stdlib.h
@@ -650,7 +649,6 @@ test_random.o: ../decl.h
 test_random.o: ../endian_calc.h
 test_random.o: ../hash.h
 test_random.o: ../have_const.h
-test_random.o: ../have_malloc.h
 test_random.o: ../have_memmv.h
 test_random.o: ../have_newstr.h
 test_random.o: ../have_stdlib.h
diff --git a/version.c b/version.c
index 7c83b73..34f1486 100644
--- a/version.c
+++ b/version.c
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.80 $
- * @(#) $Id: version.c,v 29.80 2007/02/11 10:28:20 chongo Exp $
+ * @(#) $Revision: 29.81 $
+ * @(#) $Id: version.c,v 29.81 2007/02/12 03:40:35 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $
  *
  * Under source code control:	1990/05/22 11:00:58
@@ -49,7 +49,7 @@ static char *program;
 #define MAJOR_VER	2	/* major version */
 #define MINOR_VER	12	/* minor version */
 #define MAJOR_PATCH	1	/* patch level or 0 if no patch */
-#define MINOR_PATCH	11	/* test number or 0 if no minor patch */
+#define MINOR_PATCH	12	/* test number or 0 if no minor patch */
 
 
 /*
diff --git a/win32/have_malloc.h b/win32/have_malloc.h
deleted file mode 100644
index b272966..0000000
--- a/win32/have_malloc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * DO NOT EDIT -- generated by the Makefile
- */
-
-
-#if !defined(__HAVE_MALLOC_H__)
-#define __HAVE_MALLOC_H__
-
-
-/* do we have <malloc.h>? */
-#define HAVE_MALLOC_H	 /* yes */
-
-
-#endif /* !__HAVE_MALLOC_H__ */