diff --git a/include/d3d8types.h b/include/d3d8types.h
index 35068053b83..163ee4fc381 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))