diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-06-30 13:46:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-06-30 13:46:47 (GMT) |
| commit | 539282ee0ffe1772db9e3f27c1baaaa47851ea02 (patch) | |
| tree | 6bc4c47857849b1a8ba725dd6c3a5ce10c97b731 /win | |
| parent | 71bdb52035482906a19b37a648b085fe8ab2fd24 (diff) | |
| parent | 83253ae734a523f4c548f386cc890d065d6d3d1e (diff) | |
| download | tcl-539282ee0ffe1772db9e3f27c1baaaa47851ea02.zip tcl-539282ee0ffe1772db9e3f27c1baaaa47851ea02.tar.gz tcl-539282ee0ffe1772db9e3f27c1baaaa47851ea02.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 8 | ||||
| -rw-r--r-- | win/makefile.vc | 1 | ||||
| -rw-r--r-- | win/rules.vc | 2 | ||||
| -rw-r--r-- | win/tclWinInt.h | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index edeb46f..cf1ea7b 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -573,9 +573,9 @@ ${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES) @ZLIB_DLL_FILE@ @TOMMATH_DLL_FILE@ ${TCL || echo 'ignore zip-error by adjust sfx process (not executable?)'; \ fi -${TCL_LIB_FILE}: ${TCL_OBJS} +${TCL_LIB_FILE}: ${TCL_OBJS} tclWinPanic.$(OBJEXT) ${DDE_OBJS} ${REG_OBJS} @$(RM) ${TCL_LIB_FILE} - @MAKE_LIB@ ${TCL_OBJS} ${DDE_OBJS} ${REG_OBJS} + @MAKE_LIB@ ${TCL_OBJS} tclWinPanic.$(OBJEXT) ${DDE_OBJS} ${REG_OBJS} @POST_MAKE_LIB@ ${DDE_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${DDE_OBJS} @@ -878,8 +878,8 @@ install-libraries: libraries install-tzdata install-msgs $(ROOT_DIR)/library/cookiejar/*.gz; do \ $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/cookiejar0.2"; \ done; - @echo "Installing package http 2.10a3 as a Tcl Module"; - @$(COPY) $(ROOT_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/8.6/http-2.10a3.tm"; + @echo "Installing package http 2.10a4 as a Tcl Module"; + @$(COPY) $(ROOT_DIR)/library/http/http.tcl "$(MODULE_INSTALL_DIR)/8.6/http-2.10a4.tm"; @echo "Installing package opt 0.4.7"; @for j in $(ROOT_DIR)/library/opt/*.tcl; do \ $(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/opt0.4"; \ diff --git a/win/makefile.vc b/win/makefile.vc index 6ff6118..7c61580 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -428,6 +428,7 @@ PLATFORMOBJS = \ $(TMP_DIR)\tclWinThrd.obj \
$(TMP_DIR)\tclWinTime.obj \
!if $(STATIC_BUILD)
+ $(TMP_DIR)\tclWinPanic.obj \
$(TMP_DIR)\tclWinReg.obj \
$(TMP_DIR)\tclWinDde.obj \
!else
diff --git a/win/rules.vc b/win/rules.vc index 47c0742..db65ce7 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -693,7 +693,7 @@ LINKERFLAGS = $(LINKERFLAGS) -ltcg !if [echo REM = This file is generated from rules.vc > versions.vc]
!endif
!if [echo TCL_MAJOR_VERSION = \>> versions.vc] \
- && [nmakehlp -V "$(_TCL_H)" TCL_MAJOR_VERSION >> versions.vc]
+ && [nmakehlp -V "$(_TCL_H)" "define TCL_MAJOR_VERSION" >> versions.vc]
!endif
!if [echo TCL_MINOR_VERSION = \>> versions.vc] \
&& [nmakehlp -V "$(_TCL_H)" TCL_MINOR_VERSION >> versions.vc]
diff --git a/win/tclWinInt.h b/win/tclWinInt.h index 52a9522..1b6e606 100644 --- a/win/tclWinInt.h +++ b/win/tclWinInt.h @@ -76,7 +76,7 @@ typedef struct TclPipeThreadInfo { * to do read/write operation. Additionally * used as signal to stop (state set to -1) */ volatile LONG state; /* Indicates current state of the thread */ - ClientData clientData; /* Referenced data of the main thread */ + void *clientData; /* Referenced data of the main thread */ HANDLE evWakeUp; /* Optional wake-up event worker set by shutdown */ } TclPipeThreadInfo; @@ -103,7 +103,7 @@ typedef struct TclPipeThreadInfo { MODULE_SCOPE TclPipeThreadInfo * TclPipeThreadCreateTI(TclPipeThreadInfo **pipeTIPtr, - ClientData clientData, HANDLE wakeEvent); + void *clientData, HANDLE wakeEvent); MODULE_SCOPE int TclPipeThreadWaitForSignal(TclPipeThreadInfo **pipeTIPtr); static inline void |