From f2f91f2d7d1de1f0d9f4249d90e4edfd01ed0bb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?=
 <valtri@users.sourceforge.net>
Date: Sat, 7 May 2005 09:11:37 +0000
Subject: =?UTF-8?q?*BUGFIX*=20gcc4=20patches=20from=20Dams=20Nad=C3=A9=20(?=
 =?UTF-8?q?livna.org)=20and=20Keenan=20Pepper.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CVS patchset: 7527
CVS date: 2005/05/07 09:11:37
---
 src/libw32dll/w32codec.c   | 3 +--
 src/libw32dll/wine/ext.c   | 2 +-
 src/libw32dll/wine/win32.c | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/libw32dll')

diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index ab7719da5..ba091e70f 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: w32codec.c,v 1.146 2005/04/23 02:02:28 tmmm Exp $
+ * $Id: w32codec.c,v 1.147 2005/05/07 09:11:38 valtri Exp $
  *
  * routines for using w32 codecs
  * DirectShow support by Miguel Freitas (Nov/2001)
@@ -131,7 +131,6 @@ static GUID wmav_clsid =
  */
 static pthread_mutex_t win32_codec_mutex;
 static pthread_once_t once_control = PTHREAD_ONCE_INIT;
-static char*   win32_codec_name; 
 
 #define VIDEOBUFSIZE 128*1024
 
diff --git a/src/libw32dll/wine/ext.c b/src/libw32dll/wine/ext.c
index 49e7d0719..da1ac7149 100644
--- a/src/libw32dll/wine/ext.c
+++ b/src/libw32dll/wine/ext.c
@@ -469,7 +469,7 @@ LPVOID WINAPI VirtualAlloc(LPVOID address, DWORD size, DWORD type,  DWORD protec
 
     if (type&MEM_RESERVE && (unsigned)address&0xffff) {
        size += (unsigned)address&0xffff;
-       (unsigned)address &= ~0xffff;
+       address = (unsigned)address & ~0xffff;
     }
     pgsz = sysconf(_SC_PAGESIZE);
     if (type&MEM_COMMIT && (unsigned)address%pgsz) {
diff --git a/src/libw32dll/wine/win32.c b/src/libw32dll/wine/win32.c
index f7571e2cc..dcab43ea5 100644
--- a/src/libw32dll/wine/win32.c
+++ b/src/libw32dll/wine/win32.c
@@ -2623,7 +2623,7 @@ static int WINAPI expGetWindowThreadProcessId(HWND win, int *pid_data)
     dbgprintf("GetWindowThreadProcessId(0x%x, 0x%x) => %d\n",
 	win, pid_data, tid);
     if (pid_data)
-	(int)*pid_data = tid;
+	*pid_data = tid;
     return tid;
 }
 
-- 
cgit v1.2.3