Tcl Source Code

Artifact 4493d5d8867e54f3bbff52220b81beb64157915f:

Attachment "tcl.patch" to ticket [2902965fff] added by nijtmans 2009-11-24 18:23:23.

---

*** win/Makefile.in.orig	Tue Nov 24 09:47:28 2009
--- win/Makefile.in	Tue Nov 24 11:42:55 2009
***************
*** 436,444 ****
  	@$(RM) ${TCL_DLL_FILE} $(TCL_LIB_FILE)
  	@MAKE_DLL@ ${TCL_OBJS} tcl.$(RES) $(SHLIB_LD_LIBS)
  
! ${TCL_LIB_FILE}: ${TCL_OBJS}
  	@$(RM) ${TCL_LIB_FILE}
! 	@MAKE_LIB@ ${TCL_OBJS}
  	@POST_MAKE_LIB@
  
  # assume GNU make
--- 436,444 ----
  	@$(RM) ${TCL_DLL_FILE} $(TCL_LIB_FILE)
  	@MAKE_DLL@ ${TCL_OBJS} tcl.$(RES) $(SHLIB_LD_LIBS)
  
! ${TCL_LIB_FILE}: ${TCL_OBJS} ${STUB_OBJS}
  	@$(RM) ${TCL_LIB_FILE}
! 	@MAKE_LIB@ ${TCL_OBJS} ${STUB_OBJS}
  	@POST_MAKE_LIB@
  
  # assume GNU make
***************
*** 451,459 ****
  	@-$(COPY) ${DDE_LIB_FILE}.backup ${DDE_LIB_FILE}
  	@-$(RM) ${DDE_LIB_FILE}.backup
  
! ${DDE_LIB_FILE}: ${DDE_OBJS} tclStubLib.$(OBJEXT)
  	@$(RM) ${DDE_LIB_FILE}
! 	@MAKE_LIB@ ${DDE_OBJS} tclStubLib.$(OBJEXT)
  	@POST_MAKE_LIB@
  
  ${REG_DLL_FILE}: ${REG_OBJS} ${TCL_STUB_LIB_FILE}
--- 451,459 ----
  	@-$(COPY) ${DDE_LIB_FILE}.backup ${DDE_LIB_FILE}
  	@-$(RM) ${DDE_LIB_FILE}.backup
  
! ${DDE_LIB_FILE}: ${DDE_OBJS} ${STUB_OBJS}
  	@$(RM) ${DDE_LIB_FILE}
! 	@MAKE_LIB@ ${DDE_OBJS} ${STUB_OBJS}
  	@POST_MAKE_LIB@
  
  ${REG_DLL_FILE}: ${REG_OBJS} ${TCL_STUB_LIB_FILE}
***************
*** 464,472 ****
  	@-$(COPY) ${REG_LIB_FILE}.backup ${REG_LIB_FILE}
  	@-$(RM) ${REG_LIB_FILE}.backup
  
! ${REG_LIB_FILE}: ${REG_OBJS} tclStubLib.$(OBJEXT)
  	@$(RM) ${REG_LIB_FILE}
! 	@MAKE_LIB@ ${REG_OBJS} tclStubLib.$(OBJEXT)
  	@POST_MAKE_LIB@
  
  ${TEST_DLL_FILE}: ${TCLTEST_OBJS} ${TCL_STUB_LIB_FILE}
--- 464,472 ----
  	@-$(COPY) ${REG_LIB_FILE}.backup ${REG_LIB_FILE}
  	@-$(RM) ${REG_LIB_FILE}.backup
  
! ${REG_LIB_FILE}: ${REG_OBJS} ${STUB_OBJS}
  	@$(RM) ${REG_LIB_FILE}
! 	@MAKE_LIB@ ${REG_OBJS} ${STUB_OBJS}
  	@POST_MAKE_LIB@
  
  ${TEST_DLL_FILE}: ${TCLTEST_OBJS} ${TCL_STUB_LIB_FILE}
***************
*** 477,485 ****
  	@-$(COPY) ${TEST_LIB_FILE}.backup ${TEST_LIB_FILE}
  	@-$(RM) ${TEST_LIB_FILE}.backup
  
! ${TEST_LIB_FILE}: ${TCLTEST_OBJS} tclStubLib.$(OBJEXT)
  	@$(RM) ${TEST_LIB_FILE}
! 	@MAKE_LIB@ ${TCLTEST_OBJS} tclStubLib.$(OBJEXT)
  	@POST_MAKE_LIB@
  
  # use pre-built zlib1.dll
--- 477,485 ----
  	@-$(COPY) ${TEST_LIB_FILE}.backup ${TEST_LIB_FILE}
  	@-$(RM) ${TEST_LIB_FILE}.backup
  
! ${TEST_LIB_FILE}: ${TCLTEST_OBJS} ${STUB_OBJS}
  	@$(RM) ${TEST_LIB_FILE}
! 	@MAKE_LIB@ ${TCLTEST_OBJS} ${STUB_OBJS}
  	@POST_MAKE_LIB@
  
  # use pre-built zlib1.dll
*** win/makefile.vc.orig	Tue Nov 24 09:47:57 2009
--- win/makefile.vc	Tue Nov 24 12:00:03 2009
***************
*** 420,426 ****
  	$(TMP_DIR)\tclWinSock.obj \
  	$(TMP_DIR)\tclWinThrd.obj \
  	$(TMP_DIR)\tclWinTime.obj \
! !if !$(STATIC_BUILD)
  	$(TMP_DIR)\tcl.res
  !endif
  
--- 420,429 ----
  	$(TMP_DIR)\tclWinSock.obj \
  	$(TMP_DIR)\tclWinThrd.obj \
  	$(TMP_DIR)\tclWinTime.obj \
! !if $(STATIC_BUILD)
! 	$(TMP_DIR)\tclStubLib.obj
! 	$(TMP_DIR)\tclOOStubLib.obj
! !else
  	$(TMP_DIR)\tcl.res
  !endif
  
***************
*** 620,627 ****
  !if $(TCL_USE_STATIC_PACKAGES)
  $(TCLDDELIB):
  !else
! $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj
! 	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $(TMP_DIR)\tclWinDde.obj
  !endif
  !else
  $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB)
--- 623,630 ----
  !if $(TCL_USE_STATIC_PACKAGES)
  $(TCLDDELIB):
  !else
! $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBOBJS)
! 	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $**
  !endif
  !else
  $(TCLDDELIB): $(TMP_DIR)\tclWinDde.obj $(TCLSTUBLIB)
***************
*** 634,641 ****
  !if $(TCL_USE_STATIC_PACKAGES)
  $(TCLREGLIB):
  !else
! $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj
! 	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $(TMP_DIR)\tclWinReg.obj
  !endif
  !else
  $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB)
--- 637,644 ----
  !if $(TCL_USE_STATIC_PACKAGES)
  $(TCLREGLIB):
  !else
! $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBOBJS)
! 	$(lib32) -nologo $(LINKERFLAGS) -out:$@ $**
  !endif
  !else
  $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB)
*** win/tclAppInit.c.orig	Tue Nov 24 10:32:57 2009
--- win/tclAppInit.c	Tue Nov 24 10:43:39 2009
***************
*** 125,130 ****
--- 125,134 ----
  Tcl_AppInit(
      Tcl_Interp *interp)		/* Interpreter for application. */
  {
+ #undef Tcl_InitStubs
+     if (!Tcl_InitStubs(interp, TCL_VERSION, 0)) {
+ 	return TCL_ERROR;
+     }
      if (Tcl_Init(interp) == TCL_ERROR) {
  	return TCL_ERROR;
      }