[Nscldaq-cvscommits] clients/TCL Makefile.am,3.2,3.3 TCLList.cpp,3.2,3.3

[Ron F. <ro...@us...>]

Update of /cvsroot/nscldaq/clients/TCL
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12892/TCL

Modified Files:
	Makefile.am TCLList.cpp 
Log Message:
Merge 7.4 development into 8.0 main line.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/nscldaq/clients/TCL/Makefile.am,v
retrieving revision 3.2
retrieving revision 3.3
diff -C2 -d -r3.2 -r3.3
*** Makefile.am	3 Feb 2004 21:36:05 -0000	3.2
--- Makefile.am	18 Jun 2004 12:11:03 -0000	3.3
***************
*** 6,10 ****
  	TCLTimer.cpp TCLVariable.cpp
  
! libTclPlus_la_LDFLAGS = -version-info $(SOVERSION):0
  
  include_HEADERS = TCLApplication.h TCLCommandPackage.h TCLException.h \
--- 6,11 ----
  	TCLTimer.cpp TCLVariable.cpp
  
! libTclPlus_la_LDFLAGS = -version-info $(SOVERSION):0 \
! 	-Wl,"-rpath-link=$(libdir)"
  
  include_HEADERS = TCLApplication.h TCLCommandPackage.h TCLException.h \

Index: TCLList.cpp
===================================================================
RCS file: /cvsroot/nscldaq/clients/TCL/TCLList.cpp,v
retrieving revision 3.2
retrieving revision 3.3
diff -C2 -d -r3.2 -r3.3
*** TCLList.cpp	31 Oct 2003 17:49:17 -0000	3.2
--- TCLList.cpp	18 Jun 2004 12:11:03 -0000	3.3
***************
*** 411,418 ****
        rElements.push_back(pElements[i]);
      }
! #ifdef WIN32
  	Tcl_Free((char*)pElements);
  #else
!     free(pElements);
  #endif
    }
--- 411,419 ----
        rElements.push_back(pElements[i]);
      }
! #if defined(WIN32) || (TCL_MAJOR_VERSION > 8) || \
!                 ((TCL_MAJOR_VERSION ==8) && (TCL_MINOR_VERSION > 3))
  	Tcl_Free((char*)pElements);
  #else
!     free(pElements);		// Early versions of Tcl_Free on unix failed.
  #endif
    }
***************
*** 490,494 ****
    char* pList = Tcl_Merge(n, pElements);
    setList(pList);
! #ifdef WIN32
    Tcl_Free(pList);
  #else
--- 491,496 ----
    char* pList = Tcl_Merge(n, pElements);
    setList(pList);
! #if defined(WIN32) || (TCL_MAJOR_VERSION > 8) || \
!                 ((TCL_MAJOR_VERSION ==8) && (TCL_MINORO_VERSION > 3))
    Tcl_Free(pList);
  #else