Gerald Pfeifer : d3d8: Redefine D3DVSD_MAKETOKENTYPE to avoid shift overflow (warnings).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a0991fc73f2c7d9b485f2c065487da38cd957a83
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a0991fc73f2c7d9b485f2c0654...

Author: Gerald Pfeifer 
Date:   Sun Oct 25 01:17:59 2015 +0200

d3d8: Redefine D3DVSD_MAKETOKENTYPE to avoid shift overflow (warnings).

Signed-off-by: Gerald Pfeifer 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

include/d3d8types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/d3d8types.h b/include/d3d8types.h
index 3506805..163ee4f 100644
--- a/include/d3d8types.h
+++ b/include/d3d8types.h
@@ -267,7 +267,7 @@ typedef enum _D3DVSDT_TYPE {

#define D3DVSD_MAKETOKENTYPE(TokenType) \
-  ((TokenType << D3DVSD_TOKENTYPESHIFT) & D3DVSD_TOKENTYPEMASK)
+  (((unsigned)TokenType << D3DVSD_TOKENTYPESHIFT) & D3DVSD_TOKENTYPEMASK)

#define D3DVSD_CONST(ConstantAddress, Count) \
   (D3DVSD_MAKETOKENTYPE(D3DVSD_TOKEN_CONSTMEM) | ((Count) << D3DVSD_CONSTCOUNTSHIFT) | (ConstantAddress))