A few bug fixes for Windows.
[openssl.git] / crypto / comp / c_zlib.c
index a78bf97177369e63d07dc61a7d6df640696eb15a..c2ff6c701120b80521d8bf41a313ffa02c17dd09 100644 (file)
@@ -14,6 +14,7 @@ static COMP_METHOD zlib_method_nozlib={
        NULL,
        NULL,
        NULL,
+       NULL,
        };
 
 #ifndef ZLIB
@@ -38,6 +39,7 @@ static COMP_METHOD zlib_method={
        zlib_compress_block,
        zlib_expand_block,
        NULL,
+       NULL,
        };
 
 /* 
@@ -49,7 +51,7 @@ static COMP_METHOD zlib_method={
 #if defined(WINDOWS) || defined(WIN32)
 # include <windows.h>
 
-# define Z_CALLCONV _stcall
+# define Z_CALLCONV _stdcall
 # define ZLIB_SHARED
 #else
 # define Z_CALLCONV
@@ -67,11 +69,11 @@ static int stub_inflateInit_(z_streamp strm, const char * version,
        int stream_size);
 
 /* Function pointers */
-typedef int Z_CALLCONV (*compress_ft)(Bytef *dest,uLongf *destLen,
+typedef int (Z_CALLCONV *compress_ft)(Bytef *dest,uLongf *destLen,
        const Bytef *source, uLong sourceLen);
-typedef int Z_CALLCONV (*inflateEnd_ft)(z_streamp strm);
-typedef int Z_CALLCONV (*inflate_ft)(z_streamp strm, int flush);
-typedef int Z_CALLCONV (*inflateInit__ft)(z_streamp strm,
+typedef int (Z_CALLCONV *inflateEnd_ft)(z_streamp strm);
+typedef int (Z_CALLCONV *inflate_ft)(z_streamp strm, int flush);
+typedef int (Z_CALLCONV *inflateInit__ft)(z_streamp strm,
        const char * version, int stream_size);
 static compress_ft     p_compress=NULL;
 static inflateEnd_ft   p_inflateEnd=NULL;