From 840eca52f603e138a612853aeec08169aaa29bd3 Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Fri, 9 Sep 2005 14:50:29 +0000 Subject: [PATCH] Fix gcc 4.0 warning. --- dlls/d3d8/vshaderdeclaration.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/vshaderdeclaration.c b/dlls/d3d8/vshaderdeclaration.c index 7f9c1121fca..72fc518463c 100644 --- a/dlls/d3d8/vshaderdeclaration.c +++ b/dlls/d3d8/vshaderdeclaration.c @@ -389,7 +389,7 @@ HRESULT WINAPI IDirect3DDeviceImpl_FillVertexShaderInputSW(IDirect3DDevice8Impl* /*DWORD tokenlen;*/ DWORD tokentype; /** for input readers */ - const char* curPos = NULL; + const BYTE* curPos = NULL; FLOAT x, y, z, w; SHORT u, v, r, t; DWORD dw; @@ -419,7 +419,7 @@ HRESULT WINAPI IDirect3DDeviceImpl_FillVertexShaderInputSW(IDirect3DDevice8Impl* return D3DERR_INVALIDCALL; } else { if (This->StateBlock->streamIsUP) { - curPos = ((char *) pVB) + (SkipnStrides * skip); /* Not really a VB */ + curPos = (BYTE *)pVB + (SkipnStrides * skip); /* Not really a VB */ } else { curPos = ((IDirect3DVertexBuffer8Impl*) pVB)->allocatedMemory + (SkipnStrides * skip); } @@ -576,7 +576,7 @@ HRESULT WINAPI IDirect3DDeviceImpl_FillVertexShaderInputArbHW(IDirect3DDevice8Im /*DWORD tokenlen;*/ DWORD tokentype; /** for input readers */ - const char* curPos = NULL; + const BYTE* curPos = NULL; int skip = 0; TRACE("(%p) - This:%p, skipstrides=%lu\n", vshader, This, SkipnStrides); @@ -603,7 +603,7 @@ HRESULT WINAPI IDirect3DDeviceImpl_FillVertexShaderInputArbHW(IDirect3DDevice8Im return D3DERR_INVALIDCALL; } else { if (This->StateBlock->streamIsUP) { - curPos = ((char *) pVB) + (SkipnStrides * skip); /* Not really a VB */ + curPos = ((BYTE *) pVB) + (SkipnStrides * skip); /* Not really a VB */ } else { curPos = ((IDirect3DVertexBuffer8Impl*) pVB)->allocatedMemory + (SkipnStrides * skip); } -- 2.11.4.GIT