summaryrefslogtreecommitdiff
path: root/zconf.h
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2011-09-09 23:22:21 -0700
committerMark Adler <madler@alumni.caltech.edu>2011-09-09 23:22:21 -0700
commit85e7d7d9ba71d95a9e6a64b98bae4fac09f06f1c (patch)
tree790235a70a5d719992f0bf84864e43a7a4ef376b /zconf.h
parent8e34b3a8024c028dd9fd21d70525fc6d215efde5 (diff)
downloadzlib-85e7d7d9ba71d95a9e6a64b98bae4fac09f06f1c.tar.gz
zlib 1.2.0.3v1.2.0.3
Diffstat (limited to 'zconf.h')
-rw-r--r--zconf.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/zconf.h b/zconf.h
index b17d420..28e9235 100644
--- a/zconf.h
+++ b/zconf.h
@@ -183,20 +183,21 @@
# define ZEXPORT WINAPI _export
# define ZEXPORTVA FAR _cdecl _export
# else
-# define ZEXPORT WINAPI
+# define ZEXPORT FAR _cdecl
# define ZEXPORTVA FAR _cdecl
# endif
# else
/* a fully Win32-compliant compiler */
-# define ZEXPORT WINAPI
# define ZEXPORTVA CDECL
# ifdef ZLIB_DLL
+# define ZEXPORT WINAPI
# ifdef ZLIB_INTERNAL
# define ZEXTERN extern __declspec(dllexport)
# else
# define ZEXTERN extern __declspec(dllimport)
# endif
# else
+# define ZEXPORT CDECL
# define ZEXTERN extern
# endif
# endif