[PATCH] zlib cleanup: ZEXPORT

Just a simple s/ZEXPORT//.

include/linux/zconf.h

@@ -39,13 +39,6 @@
 
 #    define OF(args)  args
 
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-
 typedef unsigned char  Byte;  /* 8 bits */
 typedef unsigned int   uInt;  /* 16 bits or more */
 typedef unsigned long  uLong; /* 32 bits or more */

include/linux/zlib.h

@@ -161,14 +161,14 @@ typedef z_stream *z_streamp;
 
                         /* basic functions */
 
-extern const char * ZEXPORT zlib_zlibVersion OF((void));
+extern const char * zlib_zlibVersion OF((void));
 /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
    If the first character differs, the library code actually used is
    not compatible with the zlib.h header file used by the application.
    This check is automatically made by deflateInit and inflateInit.
  */
 
-extern int ZEXPORT zlib_deflate_workspacesize OF((void));
+extern int zlib_deflate_workspacesize OF((void));
 /*
    Returns the number of bytes that needs to be allocated for a per-
    stream workspace.  A pointer to this number of bytes should be
@@ -176,7 +176,7 @@ extern int ZEXPORT zlib_deflate_workspacesize OF((void));
 */
 
 /* 
-extern int ZEXPORT deflateInit OF((z_streamp strm, int level));
+extern int deflateInit OF((z_streamp strm, int level));
 
      Initializes the internal stream state for compression. The fields
    zalloc, zfree and opaque must be initialized before by the caller.
@@ -198,7 +198,7 @@ extern int ZEXPORT deflateInit OF((z_streamp strm, int level));
 */
 
 
-extern int ZEXPORT zlib_deflate OF((z_streamp strm, int flush));
+extern int zlib_deflate OF((z_streamp strm, int flush));
 /*
     deflate compresses as much data as possible, and stops when the input
   buffer becomes empty or the output buffer becomes full. It may introduce some
@@ -276,7 +276,7 @@ extern int ZEXPORT zlib_deflate OF((z_streamp strm, int flush));
 */
 
 
-extern int ZEXPORT zlib_deflateEnd OF((z_streamp strm));
+extern int zlib_deflateEnd OF((z_streamp strm));
 /*
      All dynamically allocated data structures for this stream are freed.
    This function discards any unprocessed input and does not flush any
@@ -290,7 +290,7 @@ extern int ZEXPORT zlib_deflateEnd OF((z_streamp strm));
 */
 
 
-extern int ZEXPORT zlib_inflate_workspacesize OF((void));
+extern int zlib_inflate_workspacesize OF((void));
 /*
    Returns the number of bytes that needs to be allocated for a per-
    stream workspace.  A pointer to this number of bytes should be
@@ -298,7 +298,7 @@ extern int ZEXPORT zlib_inflate_workspacesize OF((void));
 */
 
 /* 
-extern int ZEXPORT zlib_inflateInit OF((z_streamp strm));
+extern int zlib_inflateInit OF((z_streamp strm));
 
      Initializes the internal stream state for decompression. The fields
    next_in, avail_in, and workspace must be initialized before by
@@ -318,7 +318,7 @@ extern int ZEXPORT zlib_inflateInit OF((z_streamp strm));
 */
 
 
-extern int ZEXPORT zlib_inflate OF((z_streamp strm, int flush));
+extern int zlib_inflate OF((z_streamp strm, int flush));
 /*
     inflate decompresses as much data as possible, and stops when the input
   buffer becomes empty or the output buffer becomes full. It may some
@@ -387,7 +387,7 @@ extern int ZEXPORT zlib_inflate OF((z_streamp strm, int flush));
 */
 
 
-extern int ZEXPORT zlib_inflateEnd OF((z_streamp strm));
+extern int zlib_inflateEnd OF((z_streamp strm));
 /*
      All dynamically allocated data structures for this stream are freed.
    This function discards any unprocessed input and does not flush any
@@ -405,7 +405,7 @@ extern int ZEXPORT zlib_inflateEnd OF((z_streamp strm));
 */
 
 /*   
-extern int ZEXPORT deflateInit2 OF((z_streamp strm,
+extern int deflateInit2 OF((z_streamp strm,
                                      int  level,
                                      int  method,
                                      int  windowBits,
@@ -448,7 +448,7 @@ extern int ZEXPORT deflateInit2 OF((z_streamp strm,
    not perform any compression: this will be done by deflate().
 */
                             
-extern int ZEXPORT zlib_deflateSetDictionary OF((z_streamp strm,
+extern int zlib_deflateSetDictionary OF((z_streamp strm,
 						     const Byte *dictionary,
 						     uInt  dictLength));
 /*
@@ -484,7 +484,7 @@ extern int ZEXPORT zlib_deflateSetDictionary OF((z_streamp strm,
    perform any compression: this will be done by deflate().
 */
 
-extern int ZEXPORT zlib_deflateCopy OF((z_streamp dest,
+extern int zlib_deflateCopy OF((z_streamp dest,
 					    z_streamp source));
 /*
      Sets the destination stream as a complete copy of the source stream.
@@ -502,7 +502,7 @@ extern int ZEXPORT zlib_deflateCopy OF((z_streamp dest,
    destination.
 */
 
-extern int ZEXPORT zlib_deflateReset OF((z_streamp strm));
+extern int zlib_deflateReset OF((z_streamp strm));
 /*
      This function is equivalent to deflateEnd followed by deflateInit,
    but does not free and reallocate all the internal compression state.
@@ -513,7 +513,7 @@ extern int ZEXPORT zlib_deflateReset OF((z_streamp strm));
    stream state was inconsistent (such as zalloc or state being NULL).
 */
 
-extern int ZEXPORT zlib_deflateParams OF((z_streamp strm,
+extern int zlib_deflateParams OF((z_streamp strm,
 					      int level,
 					      int strategy));
 /*
@@ -535,7 +535,7 @@ extern int ZEXPORT zlib_deflateParams OF((z_streamp strm,
 */
 
 /*   
-extern int ZEXPORT inflateInit2 OF((z_streamp strm,
+extern int inflateInit2 OF((z_streamp strm,
                                      int  windowBits));
 
      This is another version of inflateInit with an extra parameter. The
@@ -557,7 +557,7 @@ extern int ZEXPORT inflateInit2 OF((z_streamp strm,
    modified, but next_out and avail_out are unchanged.)
 */
 
-extern int ZEXPORT zlib_inflateSetDictionary OF((z_streamp strm,
+extern int zlib_inflateSetDictionary OF((z_streamp strm,
 						     const Byte *dictionary,
 						     uInt  dictLength));
 /*
@@ -576,7 +576,7 @@ extern int ZEXPORT zlib_inflateSetDictionary OF((z_streamp strm,
    inflate().
 */
 
-extern int ZEXPORT zlib_inflateSync OF((z_streamp strm));
+extern int zlib_inflateSync OF((z_streamp strm));
 /* 
     Skips invalid compressed data until a full flush point (see above the
   description of deflate with Z_FULL_FLUSH) can be found, or until all
@@ -591,7 +591,7 @@ extern int ZEXPORT zlib_inflateSync OF((z_streamp strm));
   until success or end of the input data.
 */
 
-extern int ZEXPORT zlib_inflateReset OF((z_streamp strm));
+extern int zlib_inflateReset OF((z_streamp strm));
 /*
      This function is equivalent to inflateEnd followed by inflateInit,
    but does not free and reallocate all the internal decompression state.
@@ -601,7 +601,7 @@ extern int ZEXPORT zlib_inflateReset OF((z_streamp strm));
    stream state was inconsistent (such as zalloc or state being NULL).
 */
 
-extern int ZEXPORT zlib_inflateIncomp OF((z_stream *strm));
+extern int zlib_inflateIncomp OF((z_stream *strm));
 /*
      This function adds the data at next_in (avail_in bytes) to the output
    history without performing any output.  There must be no pending output,
@@ -615,15 +615,15 @@ extern int ZEXPORT zlib_inflateIncomp OF((z_stream *strm));
 /* deflateInit and inflateInit are macros to allow checking the zlib version
  * and the compiler's view of z_stream:
  */
-extern int ZEXPORT zlib_deflateInit_ OF((z_streamp strm, int level,
+extern int zlib_deflateInit_ OF((z_streamp strm, int level,
                                      const char *version, int stream_size));
-extern int ZEXPORT zlib_inflateInit_ OF((z_streamp strm,
+extern int zlib_inflateInit_ OF((z_streamp strm,
                                      const char *version, int stream_size));
-extern int ZEXPORT zlib_deflateInit2_ OF((z_streamp strm, int  level, int  method,
+extern int zlib_deflateInit2_ OF((z_streamp strm, int  level, int  method,
                                       int windowBits, int memLevel,
                                       int strategy, const char *version,
                                       int stream_size));
-extern int ZEXPORT zlib_inflateInit2_ OF((z_streamp strm, int  windowBits,
+extern int zlib_inflateInit2_ OF((z_streamp strm, int  windowBits,
                                       const char *version, int stream_size));
 #define zlib_deflateInit(strm, level) \
         zlib_deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream))
@@ -640,9 +640,9 @@ extern int ZEXPORT zlib_inflateInit2_ OF((z_streamp strm, int  windowBits,
     struct internal_state {int dummy;}; /* hack for buggy compilers */
 #endif
 
-extern const char  * ZEXPORT zlib_zError           OF((int err));
-extern int           ZEXPORT zlib_inflateSyncPoint OF((z_streamp z));
-extern const uLong * ZEXPORT zlib_get_crc_table    OF((void));
+extern const char  * zlib_zError           OF((int err));
+extern int           zlib_inflateSyncPoint OF((z_streamp z));
+extern const uLong * zlib_get_crc_table    OF((void));
 
 #ifdef __cplusplus
 }

include/linux/zutil.h

@@ -62,7 +62,7 @@ typedef unsigned long  ulg;
 
          /* functions */
 
-typedef uLong (ZEXPORT *check_func) OF((uLong check, const Byte *buf,
+typedef uLong (*check_func) OF((uLong check, const Byte *buf,
 				       uInt len));
 
 

lib/zlib_deflate/deflate.c

@@ -1252,7 +1252,7 @@ local block_state deflate_slow(s, flush)
     return flush == Z_FINISH ? finish_done : block_done;
 }
 
-extern int ZEXPORT zlib_deflate_workspacesize ()
+extern int zlib_deflate_workspacesize ()
 {
     return sizeof(deflate_workspace);
 }

lib/zlib_inflate/inflate.c

@@ -8,13 +8,13 @@
 #include "infblock.h"
 #include "infutil.h"
 
-int ZEXPORT zlib_inflate_workspacesize(void)
+int zlib_inflate_workspacesize(void)
 {
   return sizeof(struct inflate_workspace);
 }
 
 
-int ZEXPORT zlib_inflateReset(
+int zlib_inflateReset(
 	z_streamp z
 )
 {
@@ -28,7 +28,7 @@ int ZEXPORT zlib_inflateReset(
 }
 
 
-int ZEXPORT zlib_inflateEnd(
+int zlib_inflateEnd(
 	z_streamp z
 )
 {
@@ -41,7 +41,7 @@ int ZEXPORT zlib_inflateEnd(
 }
 
 
-int ZEXPORT zlib_inflateInit2_(
+int zlib_inflateInit2_(
 	z_streamp z,
 	int w,
 	const char *version,
@@ -103,7 +103,7 @@ static int zlib_inflate_packet_flush(inflate_blocks_statef *s)
 }
 
 
-int ZEXPORT zlib_inflateInit_(
+int zlib_inflateInit_(
 	z_streamp z,
 	const char *version,
 	int stream_size
@@ -117,7 +117,7 @@ int ZEXPORT zlib_inflateInit_(
 #define NEEDBYTE {if(z->avail_in==0)goto empty;r=trv;}
 #define NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++)
 
-int ZEXPORT zlib_inflate(
+int zlib_inflate(
 	z_streamp z,
 	int f
 )
@@ -250,7 +250,7 @@ int ZEXPORT zlib_inflate(
 }
 
 
-int ZEXPORT zlib_inflateSync(
+int zlib_inflateSync(
 	z_streamp z
 )
 {
@@ -309,7 +309,7 @@ int ZEXPORT zlib_inflateSync(
  * decompressing, PPP checks that at the end of input packet, inflate is
  * waiting for these length bytes.
  */
-int ZEXPORT zlib_inflateSyncPoint(
+int zlib_inflateSyncPoint(
 	z_streamp z
 )
 {
@@ -380,7 +380,7 @@ static int zlib_inflate_addhistory(inflate_blocks_statef *s,
  * will have been updated if need be.
  */
 
-int ZEXPORT zlib_inflateIncomp(
+int zlib_inflateIncomp(
 	z_stream *z
 	
 )