Chromium Code Reviews| Index: third_party/qcms/src/qcmstypes.h |
| diff --git a/third_party/qcms/src/qcmstypes.h b/third_party/qcms/src/qcmstypes.h |
| index 56d8de3d15e8b61629a49a64c5ad9c8374a095cc..9a9b197c8444fe043a9c218b53ec7c0567101a6c 100644 |
| --- a/third_party/qcms/src/qcmstypes.h |
| +++ b/third_party/qcms/src/qcmstypes.h |
| @@ -87,7 +87,12 @@ typedef unsigned __int64 uint64_t; |
| #ifdef _WIN64 |
| typedef unsigned __int64 uintptr_t; |
| #else |
| +#pragma warning(push) |
|
Noel Gordon
2012/05/18 15:53:07
Note to self: wrap these pragmas in #if defined(_M
Noel Gordon
2012/05/18 16:14:53
Done.
|
| +/* Disable benign redefinition of type warning 4142 */ |
| +#pragma warning(disable:4142) |
| typedef unsigned long uintptr_t; |
| +/* Restore warnings */ |
| +#pragma warning(pop) |
|
Noel Gordon
2012/05/18 15:53:07
Note to self: and the same here.
Noel Gordon
2012/05/18 16:14:53
Done.
|
| #endif |
| #elif defined (_AIX) |