diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-02-27 00:34:31 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-02-27 00:34:31 +1100 |
| commit | 68ef52886263690632552ae187a4673945c2ab74 (patch) | |
| tree | 0453c0063397c196ebe5e3dcd4d9c91392496d77 /src/gallium/include/pipe/p_compiler.h | |
| parent | 026e2fd3c6eb87a010a9c90341e8a77b09376b5b (diff) | |
| parent | ad6bb870de6103ed240fa1f9f828bd13a4401a9a (diff) | |
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/include/pipe/p_compiler.h')
| -rw-r--r-- | src/gallium/include/pipe/p_compiler.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h index 30cd729c56..91f3d2ac2d 100644 --- a/src/gallium/include/pipe/p_compiler.h +++ b/src/gallium/include/pipe/p_compiler.h @@ -1,6 +1,6 @@ /************************************************************************** * - * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas. + * Copyright 2007-2008 Tungsten Graphics, Inc., Cedar Park, Texas. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -42,6 +42,14 @@ #endif +#if defined(__MSC__) + +/* Avoid 'expression is always true' warning */ +#pragma warning(disable: 4296) + +#endif /* __MSC__ */ + + typedef unsigned int uint; typedef unsigned char ubyte; typedef unsigned char boolean; @@ -61,8 +69,10 @@ typedef long long int64_t; typedef unsigned long long uint64_t; #if defined(_WIN64) +typedef __int64 intptr_t; typedef unsigned __int64 uintptr_t; #else +typedef int intptr_t; typedef unsigned int uintptr_t; #endif |