summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2004-02-25 14:12:34 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2004-02-25 14:12:34 (GMT)
commit9314539d269d7799c7b0d8476102bebe351c7a4b (patch)
tree704592d59e3cbd2f2e80df7800611e2060c13fba
parentc0086152bf8c3afb10f70135ac601e2ddf5c3234 (diff)
downloadtcl-9314539d269d7799c7b0d8476102bebe351c7a4b.zip
tcl-9314539d269d7799c7b0d8476102bebe351c7a4b.tar.gz
tcl-9314539d269d7799c7b0d8476102bebe351c7a4b.tar.bz2
* win/tclWinDde.c: Removed some gcc warnings - except for the
-Wconversion warning for GetGlobalAtomName. gcc is just wrong about this.
-rw-r--r--ChangeLog6
-rw-r--r--win/tclWinDde.c10
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b4e2f2c..28e54fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-25 Pat Thoyts <patthoyts@users.sourceforge.net>
+
+ * win/tclWinDde.c: Removed some gcc warnings - except for the
+ -Wconversion warning for GetGlobalAtomName. gcc is just wrong
+ about this.
+
2004-02-24 Donal K. Fellows <donal.k.fellows@man.ac.uk>
IMPLEMENTATION OF TIP#100 FROM GEORGIOS PETASIS
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index a37cb60..3570fe8 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.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: tclWinDde.c,v 1.18 2003/11/10 22:55:48 dgp Exp $
+ * RCS: @(#) $Id: tclWinDde.c,v 1.19 2004/02/25 14:12:35 patthoyts Exp $
*/
#include "tclPort.h"
@@ -995,7 +995,7 @@ DdeServicesOnAck(HWND hwnd, WPARAM wParam, LPARAM lParam)
&& (es->topic == (ATOM)NULL || es->topic == topic)) {
Tcl_Obj *matchPtr = Tcl_NewListObj(0, NULL);
- GlobalGetAtomName(service, sz, 255);
+ GlobalGetAtomName((ATOM)service, sz, 255);
Tcl_ListObjAppendElement(es->interp, matchPtr,
Tcl_NewStringObj(sz, -1));
GlobalGetAtomName(topic, sz, 255);
@@ -1034,7 +1034,7 @@ static int
DdeGetServicesList(Tcl_Interp *interp, char *serviceName, char *topicName)
{
ddeEnumServices es;
- int r = TCL_OK;
+
es.interp = interp;
es.result = TCL_OK;
es.service = (serviceName == NULL)
@@ -1158,9 +1158,9 @@ Tcl_DdeObjCmd(
HDDEDATA ddeItemData = NULL;
HCONV hConv = NULL;
HSZ ddeCookie = 0;
- char *serviceName, *topicName, *itemString, *dataString;
+ char *serviceName = NULL, *topicName = NULL, *itemString, *dataString;
char *string;
- int firstArg, length, dataLength;
+ int firstArg = 0, length, dataLength;
DWORD ddeResult;
HDDEDATA ddeReturn;
RegisteredInterp *riPtr;