diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-01-06 11:21:05 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-01-06 11:21:05 (GMT) |
| commit | 80d3b0d2ffd5551ba162df62f882dcdc18e4d30d (patch) | |
| tree | ee7ac89d6452186f024dbd308ef39335dba8b183 /win | |
| parent | 3c4a5377c3aab16dd1aba24e71abcfe4994e18a3 (diff) | |
| parent | 86b9cc18cdb1b06c9e34a429885a716f2c3e6a04 (diff) | |
| download | tcl-80d3b0d2ffd5551ba162df62f882dcdc18e4d30d.zip tcl-80d3b0d2ffd5551ba162df62f882dcdc18e4d30d.tar.gz tcl-80d3b0d2ffd5551ba162df62f882dcdc18e4d30d.tar.bz2 | |
merge trunk
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 2 | ||||
| -rw-r--r-- | win/tclWinChan.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index bbb1921..e5104f9 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -467,7 +467,7 @@ ${TEST_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS} # use pre-built zlib1.dll ${ZLIB_DLL_FILE}: ${TCL_STUB_LIB_FILE} - @if test "@ZLIB_LIBS@set" != "${ZLIB_DIR}/win32/zdll.libset" ; then \ + @if test "@ZLIB_LIBS@set" != "${ZLIB_DIR_NATIVE}/win32/zdll.libset" ; then \ $(COPY) $(ZLIB_DIR)/win64/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \ else \ $(COPY) $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \ diff --git a/win/tclWinChan.c b/win/tclWinChan.c index 4b3f930..7518e3e 100644 --- a/win/tclWinChan.c +++ b/win/tclWinChan.c @@ -95,7 +95,7 @@ static void FileThreadActionProc(ClientData instanceData, static int FileTruncateProc(ClientData instanceData, Tcl_WideInt length); static DWORD FileGetType(HANDLE handle); -static int NativeIsComPort(CONST TCHAR *nativeName); +static int NativeIsComPort(const TCHAR *nativeName); /* * This structure describes the channel type structure for file based IO. */ |