Chromium Code Reviews| Index: third_party/zlib/zutil.h |
| diff --git a/third_party/zlib/zutil.h b/third_party/zlib/zutil.h |
| index 39cf37304767e7236d30d8e89d489648d238a73b..3c8326f5ec257c06115b3ee97df970e9ec550390 100644 |
| --- a/third_party/zlib/zutil.h |
| +++ b/third_party/zlib/zutil.h |
| @@ -142,6 +142,12 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ |
| # define OS_CODE 0x0a |
| #endif |
| +#ifdef _MSC_VER |
| +#define zalign(x) __declspec(align(x)) |
| +#else |
| +#define zalign(x) __attribute__((aligned((x)))) |
| +#endif |
| + |
| #ifdef WIN32 |
| # ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */ |
| # define OS_CODE 0x0b |