summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2009-11-16 06:29:16 (GMT)
committermdejong <mdejong>2009-11-16 06:29:16 (GMT)
commitd264119bd45f0b0e694574efc0a627ac1a4232cb (patch)
tree7317fd8f77b901fe6241c4c976a2fe417760332c
parent0ff9c6a9c918c519b765feaa5c09bf489290d50c (diff)
downloadtcl-d264119bd45f0b0e694574efc0a627ac1a4232cb.zip
tcl-d264119bd45f0b0e694574efc0a627ac1a4232cb.tar.gz
tcl-d264119bd45f0b0e694574efc0a627ac1a4232cb.tar.bz2
* win/tclWinDde.c: Avoid gcc compiler warning by
explicitly casting DdeCreateStringHandle argument.
-rw-r--r--ChangeLog5
-rw-r--r--win/tclWinDde.c10
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 7757b62..2f54ae6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-15 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * win/tclWinDde.c: Avoid gcc compiler warning by
+ explicitly casting DdeCreateStringHandle argument.
+
2009-11-12 Andreas Kupries <andreask@activestate.com>
* generic/tclIO.c (CopyData): [Bug 2895565]. Dropped bogosity
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 4c7fc5b..2e0c7c3 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -9,7 +9,7 @@
* 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.35 2009/08/16 10:20:19 nijtmans Exp $
+ * RCS: @(#) $Id: tclWinDde.c,v 1.36 2009/11/16 06:29:16 mdejong Exp $
*/
#include "tclInt.h"
@@ -886,7 +886,7 @@ MakeDdeConnection(
HCONV ddeConv;
ddeService = DdeCreateStringHandle(ddeInstance, TCL_DDE_SERVICE_NAME, 0);
- ddeTopic = DdeCreateStringHandle(ddeInstance, name, 0);
+ ddeTopic = DdeCreateStringHandle(ddeInstance, (LPTSTR) name, 0);
ddeConv = DdeConnect(ddeInstance, ddeService, ddeTopic, NULL);
DdeFreeStringHandle(ddeInstance, ddeService);
@@ -1319,7 +1319,7 @@ Tcl_DdeObjCmd(
if (length == 0) {
serviceName = NULL;
} else if ((index != DDE_SERVERNAME) && (index != DDE_EVAL)) {
- ddeService = DdeCreateStringHandle(ddeInstance, serviceName,
+ ddeService = DdeCreateStringHandle(ddeInstance, (LPTSTR) serviceName,
CP_WINANSI);
}
@@ -1328,7 +1328,7 @@ Tcl_DdeObjCmd(
if (length == 0) {
topicName = NULL;
} else {
- ddeTopic = DdeCreateStringHandle(ddeInstance, topicName,
+ ddeTopic = DdeCreateStringHandle(ddeInstance, (LPTSTR)topicName,
CP_WINANSI);
}
}
@@ -1454,7 +1454,7 @@ Tcl_DdeObjCmd(
SetDdeError(interp);
result = TCL_ERROR;
} else {
- ddeItem = DdeCreateStringHandle(ddeInstance, itemString,
+ ddeItem = DdeCreateStringHandle(ddeInstance, (LPTSTR)itemString,
CP_WINANSI);
if (ddeItem != NULL) {
ddeData = DdeClientTransaction((PBYTE)dataString, (DWORD) length+1,