diff options
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 2 | ||||
| -rw-r--r-- | win/tcl.m4 | 6 | ||||
| -rw-r--r-- | win/tclWinMtherr.c | 4 | ||||
| -rw-r--r-- | win/tclWinPort.h | 2 | ||||
| -rw-r--r-- | win/tclWinTest.c | 2 | ||||
| -rw-r--r-- | win/tclWinTime.c | 2 |
6 files changed, 11 insertions, 7 deletions
diff --git a/win/configure b/win/configure index ed0f21d..06c3dfe 100755 --- a/win/configure +++ b/win/configure @@ -1670,7 +1670,7 @@ echo "configure:1596: checking compiler flags" >&5 CFLAGS_DEBUG=-g CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" - CFLAGS_WARNING="-Wall -Wconversion" + CFLAGS_WARNING="-Wall -fno-strict-aliasing" LDFLAGS_DEBUG= LDFLAGS_OPTIMIZE= @@ -519,7 +519,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ CFLAGS_DEBUG=-g CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer" - CFLAGS_WARNING="-Wall -Wconversion" + CFLAGS_WARNING="-Wall -fno-strict-aliasing" LDFLAGS_DEBUG= LDFLAGS_OPTIMIZE= @@ -918,8 +918,8 @@ AC_DEFUN([SC_EMBED_MANIFEST], [ [ --enable-embedded-manifest embed manifest if possible (default: yes)], [embed_ok=$enableval], [embed_ok=yes]) - VC_MANIFEST_EMBED_DLL= - VC_MANIFEST_EMBED_EXE= + VC_MANIFEST_EMBED_DLL= + VC_MANIFEST_EMBED_EXE= result=no if test "$embed_ok" = "yes" -a "${SHARED_BUILD}" = "1" \ -a "$GCC" != "yes" ; then diff --git a/win/tclWinMtherr.c b/win/tclWinMtherr.c index 6005e58..269a363 100644 --- a/win/tclWinMtherr.c +++ b/win/tclWinMtherr.c @@ -14,6 +14,7 @@ #include <math.h> +#ifndef __MINGW32__ /* *---------------------------------------------------------------------- * @@ -49,3 +50,6 @@ _matherr(xPtr) } return 1; } + +#endif /* !__MINGW__ */ + diff --git a/win/tclWinPort.h b/win/tclWinPort.h index 8d1ce68..be5058c 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -97,7 +97,7 @@ /* * Not all mingw32 versions have this struct. */ -#if !defined(__BORLANDC__) && !defined(_MSC_VER) && !defined(_WIN64) && !defined(HAVE_STRUCT_STAT32I64) +#if !defined(__BORLANDC__) && !defined(_MSC_VER) && !defined(_WIN64) && !defined(HAVE_STRUCT_STAT32I64) && defined(BUILD_tcl) struct _stat32i64 { dev_t st_dev; ino_t st_ino; diff --git a/win/tclWinTest.c b/win/tclWinTest.c index ecdf21f..ba35ec7 100644 --- a/win/tclWinTest.c +++ b/win/tclWinTest.c @@ -266,7 +266,7 @@ TestwinclockCmd( ClientData dummy, Tcl_Obj *CONST objv[] ) /* Argument vector */ { - CONST static FILETIME posixEpoch = { 0xD53E8000, 0x019DB1DE }; + static CONST FILETIME posixEpoch = { 0xD53E8000, 0x019DB1DE }; /* The Posix epoch, expressed as a * Windows FILETIME */ Tcl_Time tclTime; /* Tcl clock */ diff --git a/win/tclWinTime.c b/win/tclWinTime.c index 12e413f..dd5699e 100644 --- a/win/tclWinTime.c +++ b/win/tclWinTime.c @@ -119,7 +119,7 @@ static TimeInfo timeInfo = { 0 }; -CONST static FILETIME posixEpoch = { 0xD53E8000, 0x019DB1DE }; +static CONST FILETIME posixEpoch = { 0xD53E8000, 0x019DB1DE }; /* * Declarations for functions defined later in this file. |