projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
zlib
/
zutil.h
diff --git
a/src/third_party/zlib/zutil.h
b/src/third_party/zlib/zutil.h
index
39cf373
..
3c8326f
100644
(file)
--- a/
src/third_party/zlib/zutil.h
+++ b/
src/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