diff options
author | nijtmans <nijtmans> | 2009-11-23 20:17:36 (GMT) |
---|---|---|
committer | nijtmans <nijtmans> | 2009-11-23 20:17:36 (GMT) |
commit | 1e53451f28489099ede27c46d8672b7281e44614 (patch) | |
tree | 9f5d34f3682d12c06c74e9e2929d7b3d4c6afb00 /win/tclWinDde.c | |
parent | a572d7070900a843d0b8cc6c6bee105f8411c90c (diff) | |
download | tcl-1e53451f28489099ede27c46d8672b7281e44614.zip tcl-1e53451f28489099ede27c46d8672b7281e44614.tar.gz tcl-1e53451f28489099ede27c46d8672b7281e44614.tar.bz2 |
#undef STATIC_BUILD in tclWin(Dde|Reg).c, in order to make
sure that Xxxxx_Init is always exported even when Tcl is built
static (otherwise we cannot create a DLL).
tclThreadTest.c: Make all functions static, except TclThread_Init.
fCmd.test Enable fCmd-30.1 when registry is available.
tcl.m4 Fix ${SHLIB_LD_LIBS} definition, fix conflicts
configure.in between static libraries and import library on windows.
configure (regenerated)
Makefile.in Simplifications related to tcl.m4 changes.
Diffstat (limited to 'win/tclWinDde.c')
-rw-r--r-- | win/tclWinDde.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/win/tclWinDde.c b/win/tclWinDde.c index 5f82d76..742ff05 100644 --- a/win/tclWinDde.c +++ b/win/tclWinDde.c @@ -9,9 +9,10 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinDde.c,v 1.37 2009/11/18 23:46:05 nijtmans Exp $ + * RCS: @(#) $Id: tclWinDde.c,v 1.38 2009/11/23 20:17:36 nijtmans Exp $ */ +#undef STATIC_BUILD #ifndef USE_TCL_STUBS # define USE_TCL_STUBS #endif @@ -114,7 +115,7 @@ static int MakeDdeConnection(Tcl_Interp *interp, const char *name, HCONV *ddeConvPtr); static void SetDdeError(Tcl_Interp *interp); -int Tcl_DdeObjCmd(ClientData clientData, +static int DdeObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); @@ -147,7 +148,7 @@ Dde_Init( return TCL_ERROR; } - Tcl_CreateObjCommand(interp, "dde", Tcl_DdeObjCmd, NULL, NULL); + Tcl_CreateObjCommand(interp, "dde", DdeObjCmd, NULL, NULL); tsdPtr = TCL_TSD_INIT(&dataKey); Tcl_CreateExitHandler(DdeExitProc, NULL); return Tcl_PkgProvide(interp, TCL_DDE_PACKAGE_NAME, TCL_DDE_VERSION); @@ -403,7 +404,7 @@ DdeSetServerName( Tcl_ExposeCommand(interp, "dde", "dde"); } - Tcl_CreateObjCommand(interp, "dde", Tcl_DdeObjCmd, + Tcl_CreateObjCommand(interp, "dde", DdeObjCmd, (ClientData) riPtr, DeleteProc); if (Tcl_IsSafe(interp)) { Tcl_HideCommand(interp, "dde", "dde"); @@ -1125,7 +1126,7 @@ SetDdeError( /* *---------------------------------------------------------------------- * - * Tcl_DdeObjCmd -- + * DdeObjCmd -- * * This function is invoked to process the "dde" Tcl command. See the * user documentation for details on what it does. @@ -1139,8 +1140,8 @@ SetDdeError( *---------------------------------------------------------------------- */ -int -Tcl_DdeObjCmd( +static int +DdeObjCmd( ClientData clientData, /* Used only for deletion */ Tcl_Interp *interp, /* The interp we are sending from */ int objc, /* Number of arguments */ |