From 3aa2c84455d3f19dcc554b7d45caa624f3f53e60 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 7 Jun 2012 08:23:36 +0000
Subject: eliminate some warnings, caused by previous merge

---
 generic/tkIntPlatDecls.h | 2 ++
 win/tkWinPointer.c       | 1 +
 2 files changed, 3 insertions(+)

diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h
index 1e0a758..d0753f1 100644
--- a/generic/tkIntPlatDecls.h
+++ b/generic/tkIntPlatDecls.h
@@ -1191,6 +1191,8 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr;
 #endif
 
 #ifdef __WIN32__
+#undef TkpCmapStressed
+#undef TkpSync
 #define TkpCmapStressed(tkwin,colormap) (0)
 #define TkpSync(display)
 #endif
diff --git a/win/tkWinPointer.c b/win/tkWinPointer.c
index 7aec2b4..dcddb8f 100644
--- a/win/tkWinPointer.c
+++ b/win/tkWinPointer.c
@@ -360,6 +360,7 @@ XWarpPointer(
 
     GetWindowRect(Tk_GetHWND(dest_w), &r);
     SetCursorPos(r.left+dest_x, r.top+dest_y);
+    return Success;
 }
 
 /*
-- 
cgit v0.12