summaryrefslogtreecommitdiffstats
path: root/win/tkWinSend.c
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2008-04-08 03:28:04 (GMT)
committerKevin B Kenny <kennykb@acm.org>2008-04-08 03:28:04 (GMT)
commitcf6cbd25cb59c0002784a0a740d36481be63abf8 (patch)
tree6b13f877dafa6297111f43f00c7de9f4e8ccad2e /win/tkWinSend.c
parent336c6a7ae7557bae330981e3ff138b77bd428bfd (diff)
downloadtk-cf6cbd25cb59c0002784a0a740d36481be63abf8.zip
tk-cf6cbd25cb59c0002784a0a740d36481be63abf8.tar.gz
tk-cf6cbd25cb59c0002784a0a740d36481be63abf8.tar.bz2
* tkDecls.h: Reverted das's change of Tk's stubs pointers
* tkIntDecls.h: from 'extern' to 'EXTERN'. Since the stubs pointer * tkPlatDecls.h: is always linked statically, its wrong to import or export it from a DLL, and the change causes trouble for extensions that build with -DUSE_TK_STUBS. * tkWinEmbed.c: Removed #if 0 code. Trust the revision control system, if you need it again, you can find it. * tkWinSend.c: Added conditional compilation to silence several compiler warnings.
Diffstat (limited to 'win/tkWinSend.c')
-rw-r--r--win/tkWinSend.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/win/tkWinSend.c b/win/tkWinSend.c
index 086d55e..ac94c0b 100644
--- a/win/tkWinSend.c
+++ b/win/tkWinSend.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinSend.c,v 1.15 2007/12/13 15:28:56 dgp Exp $
+ * RCS: @(#) $Id: tkWinSend.c,v 1.16 2008/04/08 03:28:05 kennykb Exp $
*/
#include "tkInt.h"
@@ -63,13 +63,17 @@ static Tcl_ThreadDataKey dataKey;
* Functions internal to this file.
*/
+#ifdef TK_SEND_ENABLED_ON_WINDOWS
static void CmdDeleteProc(ClientData clientData);
static void InterpDeleteProc(ClientData clientData,
Tcl_Interp *interp);
+#endif
static void RevokeObjectRegistration(RegisteredInterp *riPtr);
static HRESULT BuildMoniker(const char *name, LPMONIKER *pmk);
+#ifdef TK_SEND_ENABLED_ON_WINDOWS
static HRESULT RegisterInterp(const char *name,
RegisteredInterp *riPtr);
+#endif
static int FindInterpreterObject(Tcl_Interp *interp,
const char *name, LPDISPATCH *ppdisp);
static int Send(LPDISPATCH pdispInterp, Tcl_Interp *interp,
@@ -471,6 +475,7 @@ FindInterpreterObject(
*--------------------------------------------------------------
*/
+#ifdef TK_SEND_ENABLED_ON_WINDOWS
static void
CmdDeleteProc(
ClientData clientData)
@@ -506,6 +511,7 @@ CmdDeleteProc(
ckfree(clientData);
}
+#endif
/*
*--------------------------------------------------------------
@@ -568,6 +574,7 @@ RevokeObjectRegistration(
* ----------------------------------------------------------------------
*/
+#ifdef TK_SEND_ENABLED_ON_WINDOWS
static void
InterpDeleteProc(
ClientData clientData,
@@ -575,6 +582,7 @@ InterpDeleteProc(
{
CoUninitialize();
}
+#endif
/*
* ----------------------------------------------------------------------
@@ -638,6 +646,7 @@ BuildMoniker(
* ----------------------------------------------------------------------
*/
+#ifdef TK_SEND_ENABLED_ON_WINDOWS
static HRESULT
RegisterInterp(
const char *name,
@@ -694,6 +703,7 @@ RegisterInterp(
Tcl_DStringFree(&dString);
return hr;
}
+#endif
/*
* ----------------------------------------------------------------------