[Libreoffice-commits] core.git: hwpfilter/source

[Jochen Nitschke]

 hwpfilter/source/hgzip.cxx |   16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

New commits:
commit 6adebd2b2b4cf1b78d6b545fcdf798164d7bbd9e
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Wed Sep 28 12:07:14 2016 +0200

    remove define 'local'
    
    Change-Id: I7b8ff60a25a5b835b7a2893befeb82b424bbcd2c
    Reviewed-on: https://gerrit.libreoffice.org/29354
    Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>
    Tested-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>

diff --git a/hwpfilter/source/hgzip.cxx b/hwpfilter/source/hgzip.cxx
index 53ec16b..81dda52 100644
--- a/hwpfilter/source/hgzip.cxx
+++ b/hwpfilter/source/hgzip.cxx
@@ -26,18 +26,14 @@
 #include "hgzip.h"
 #include "hstream.hxx"
 
-#ifndef local
-#  define local static
-#endif
-
 #define Z_BUFSIZE   (1024 * 4)
 
 #define ALLOC(size) malloc(size)
 #define TRYFREE(p) {if (p) free(p);}
 
-local int get_byte(gz_stream * s);
-local int destroy(gz_stream * s);
-local uLong getLong(gz_stream * s);
+static int get_byte(gz_stream * s);
+static int destroy(gz_stream * s);
+static uLong getLong(gz_stream * s);
 
 /* ===========================================================================
    Opens a gzip (.gz) file for reading or writing. The mode parameter
@@ -99,7 +95,7 @@ gz_stream *gz_open(HStream & _stream)
    for end of file.
    IN assertion: the stream s has been successfully opened for reading.
 */
-local int get_byte(gz_stream * s)
+static int get_byte(gz_stream * s)
 {
     if (s->z_eof)
         return EOF;
@@ -124,7 +120,7 @@ local int get_byte(gz_stream * s)
  * Cleanup then free the given gz_stream. Return a zlib error code.
  * Try freeing in the reverse order of allocations.
  */
-local int destroy(gz_stream * s)
+static int destroy(gz_stream * s)
 {
     int err = Z_OK;
 
@@ -258,7 +254,7 @@ int gz_flush(gz_stream * file, int flush)
 /* ===========================================================================
    Reads a long in LSB order from the given gz_stream. Sets
 */
-local uLong getLong(gz_stream * s)
+static uLong getLong(gz_stream * s)
 {
     uLong x = (unsigned char) get_byte(s);