diff options
| -rw-r--r-- | compat/zlib/contrib/minizip/ioapi.c | 6 | ||||
| -rw-r--r-- | compat/zlib/contrib/minizip/minizip.c | 6 | ||||
| -rw-r--r-- | generic/tclStubInit.c | 26 | ||||
| -rwxr-xr-x | unix/configure | 8 | ||||
| -rw-r--r-- | unix/configure.ac | 4 | ||||
| -rwxr-xr-x | win/configure | 5 | ||||
| -rw-r--r-- | win/configure.ac | 3 |
7 files changed, 39 insertions, 19 deletions
diff --git a/compat/zlib/contrib/minizip/ioapi.c b/compat/zlib/contrib/minizip/ioapi.c index 7f5c191..8274a3d 100644 --- a/compat/zlib/contrib/minizip/ioapi.c +++ b/compat/zlib/contrib/minizip/ioapi.c @@ -14,7 +14,11 @@ #define _CRT_SECURE_NO_WARNINGS #endif -#if defined(__APPLE__) || defined(IOAPI_NO_64) +#if defined(_WIN32) +#define FOPEN_FUNC(filename, mode) fopen(filename, mode) +#define FTELLO_FUNC(stream) _ftelli64(stream) +#define FSEEKO_FUNC(stream, offset, origin) _fseeki64(stream, offset, origin) +#elif defined(__APPLE__) || defined(IOAPI_NO_64) // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions #define FOPEN_FUNC(filename, mode) fopen(filename, mode) #define FTELLO_FUNC(stream) ftello(stream) diff --git a/compat/zlib/contrib/minizip/minizip.c b/compat/zlib/contrib/minizip/minizip.c index 2dd9f10..2c7ffb1 100644 --- a/compat/zlib/contrib/minizip/minizip.c +++ b/compat/zlib/contrib/minizip/minizip.c @@ -27,7 +27,11 @@ #endif #endif -#if defined(__APPLE__) || defined(IOAPI_NO_64) +#if defined(_WIN32) +#define FOPEN_FUNC(filename, mode) fopen(filename, mode) +#define FTELLO_FUNC(stream) _ftelli64(stream) +#define FSEEKO_FUNC(stream, offset, origin) _fseeki64(stream, offset, origin) +#elif defined(__APPLE__) || defined(IOAPI_NO_64) // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions #define FOPEN_FUNC(filename, mode) fopen(filename, mode) #define FTELLO_FUNC(stream) ftello(stream) diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 5405ec4..9719390 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -138,19 +138,7 @@ #define TclBN_mp_tc_div_2d mp_tc_div_2d #define TclBN_mp_get_bit mp_get_bit -#if !defined(TCL_NO_DEPRECATED) && (!defined(_WIN32) || defined(STATIC_BUILD)) -#define TclBN_reverse bn_reverse -#define TclBN_fast_s_mp_mul_digs fast_s_mp_mul_digs -#define TclBN_fast_s_mp_sqr fast_s_mp_sqr -#define TclBN_mp_karatsuba_mul mp_karatsuba_mul -#define TclBN_mp_karatsuba_sqr mp_karatsuba_sqr -#define TclBN_mp_toom_mul mp_toom_mul -#define TclBN_mp_toom_sqr mp_toom_sqr -#define TclBN_s_mp_add s_mp_add -#define TclBN_s_mp_mul_digs s_mp_mul_digs -#define TclBN_s_mp_sqr s_mp_sqr -#define TclBN_s_mp_sub s_mp_sub -#else +#if defined(TCL_NO_DEPRECATED) || defined(TCL_WITH_EXTERNAL_TOMMATH) #define TclBN_reverse 0 #define TclBN_fast_s_mp_mul_digs 0 #define TclBN_fast_s_mp_sqr 0 @@ -162,6 +150,18 @@ #define TclBN_s_mp_mul_digs 0 #define TclBN_s_mp_sqr 0 #define TclBN_s_mp_sub 0 +#else +#define TclBN_reverse bn_reverse +#define TclBN_fast_s_mp_mul_digs fast_s_mp_mul_digs +#define TclBN_fast_s_mp_sqr fast_s_mp_sqr +#define TclBN_mp_karatsuba_mul mp_karatsuba_mul +#define TclBN_mp_karatsuba_sqr mp_karatsuba_sqr +#define TclBN_mp_toom_mul mp_toom_mul +#define TclBN_mp_toom_sqr mp_toom_sqr +#define TclBN_s_mp_add s_mp_add +#define TclBN_s_mp_mul_digs s_mp_mul_digs +#define TclBN_s_mp_sqr s_mp_sqr +#define TclBN_s_mp_sub s_mp_sub #endif /* See bug 510001: TclSockMinimumBuffers needs plat imp */ diff --git a/unix/configure b/unix/configure index d310777..ea625ca 100755 --- a/unix/configure +++ b/unix/configure @@ -4756,7 +4756,13 @@ else fi fi -if test $libtommath_ok = no; then : +if test $libtommath_ok = yes; then : + + +$as_echo "#define TCL_WITH_EXTERNAL_TOMMATH 1" >>confdefs.h + + +else TOMMATH_OBJS=\${TOMMATH_OBJS} diff --git a/unix/configure.ac b/unix/configure.ac index a2ebecf..5542b7f 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -178,7 +178,9 @@ AS_IF([test $libtommath_ok = yes], [ AC_SEARCH_LIBS([mp_get_bit],[tommath],[],[ libtommath_ok=no ])]) -AS_IF([test $libtommath_ok = no], [ +AS_IF([test $libtommath_ok = yes], [ + AC_DEFINE(TCL_WITH_EXTERNAL_TOMMATH, 1, [Tcl with external libtommath]) +], [ AC_SUBST(TOMMATH_OBJS,[\${TOMMATH_OBJS}]) AC_SUBST(TOMMATH_SRCS,[\${TOMMATH_SRCS}]) AC_SUBST(TOMMATH_INCLUDE,[-I\${TOMMATH_DIR}]) diff --git a/win/configure b/win/configure index 29dc6d6..0f81138 100755 --- a/win/configure +++ b/win/configure @@ -4597,10 +4597,13 @@ if test "$tcl_ok" = "yes"; then : TOMMATH_DLL_FILE=\${TOMMATH_DLL_FILE} + +$as_echo "#define TCL_WITH_EXTERNAL_TOMMATH 1" >>confdefs.h + if test "$do64bit" != "no"; then : -$as_echo "#define MD_64BIT 1" >>confdefs.h +$as_echo "#define MP_64BIT 1" >>confdefs.h if test "$GCC" == "yes"; then : diff --git a/win/configure.ac b/win/configure.ac index 3edfe78..37a0998 100644 --- a/win/configure.ac +++ b/win/configure.ac @@ -124,8 +124,9 @@ AS_IF([test "${enable_shared+set}" = "set"], [ AS_IF([test "$tcl_ok" = "yes"], [ AC_SUBST(ZLIB_DLL_FILE,[\${ZLIB_DLL_FILE}]) AC_SUBST(TOMMATH_DLL_FILE,[\${TOMMATH_DLL_FILE}]) + AC_DEFINE(TCL_WITH_EXTERNAL_TOMMATH, 1, [Tcl with external libtommath]) AS_IF([test "$do64bit" != "no"], [ - AC_DEFINE(MD_64BIT, 1, [Using libtommath.dll in 64-bit mode]) + AC_DEFINE(MP_64BIT, 1, [Using libtommath.dll in 64-bit mode]) AS_IF([test "$GCC" == "yes"],[ AC_SUBST(ZLIB_LIBS,[\${ZLIB_DIR_NATIVE}/win64/libz.dll.a]) AC_SUBST(TOMMATH_LIBS,[\${TOMMATH_DIR_NATIVE}/win64/libtommath.dll.a]) |