summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2016-10-26 10:25:10 -0700
committerMark Adler <madler@alumni.caltech.edu>2016-10-26 10:25:10 -0700
commitbedea2483b6cf0f5af0f50010031bb56f5512124 (patch)
treebd1655913a9ed074e33e8b8c07d3f6c2d96b1825
parentce12c5cd00628bf8f680c98123a369974d32df15 (diff)
downloadzlib-bedea2483b6cf0f5af0f50010031bb56f5512124.tar.gz
zlib-bedea2483b6cf0f5af0f50010031bb56f5512124.tar.bz2
zlib-bedea2483b6cf0f5af0f50010031bb56f5512124.zip
Clean up and comment the use of local for static.
-rw-r--r--adler32.c2
-rw-r--r--crc32.c2
-rw-r--r--gzguts.h4
-rw-r--r--zutil.h4
4 files changed, 6 insertions, 6 deletions
diff --git a/adler32.c b/adler32.c
index cfacc88..3eafddf 100644
--- a/adler32.c
+++ b/adler32.c
@@ -7,8 +7,6 @@
7 7
8#include "zutil.h" 8#include "zutil.h"
9 9
10#define local static
11
12local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); 10local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
13 11
14#define BASE 65521U /* largest prime smaller than 65536 */ 12#define BASE 65521U /* largest prime smaller than 65536 */
diff --git a/crc32.c b/crc32.c
index d49f39c..d4efea3 100644
--- a/crc32.c
+++ b/crc32.c
@@ -30,8 +30,6 @@
30 30
31#include "zutil.h" /* for STDC and FAR definitions */ 31#include "zutil.h" /* for STDC and FAR definitions */
32 32
33#define local static
34
35/* Definitions for doing the crc four data bytes at a time. */ 33/* Definitions for doing the crc four data bytes at a time. */
36#if !defined(NOBYFOUR) && defined(Z_U4) 34#if !defined(NOBYFOUR) && defined(Z_U4)
37# define BYFOUR 35# define BYFOUR
diff --git a/gzguts.h b/gzguts.h
index bb62175..4f83d6d 100644
--- a/gzguts.h
+++ b/gzguts.h
@@ -114,7 +114,9 @@
114#ifndef local 114#ifndef local
115# define local static 115# define local static
116#endif 116#endif
117/* compile with -Dlocal if your debugger can't find static symbols */ 117/* since "static" is used to mean two completely different things in C, we
118 define "local" for the non-static meaning of "static", for readability
119 (compile with -Dlocal if your debugger can't find static symbols) */
118 120
119/* gz* functions always use library allocation functions */ 121/* gz* functions always use library allocation functions */
120#ifndef STDC 122#ifndef STDC
diff --git a/zutil.h b/zutil.h
index 9441a1e..96cc90f 100644
--- a/zutil.h
+++ b/zutil.h
@@ -36,7 +36,9 @@
36#ifndef local 36#ifndef local
37# define local static 37# define local static
38#endif 38#endif
39/* compile with -Dlocal if your debugger can't find static symbols */ 39/* since "static" is used to mean two completely different things in C, we
40 define "local" for the non-static meaning of "static", for readability
41 (compile with -Dlocal if your debugger can't find static symbols) */
40 42
41typedef unsigned char uch; 43typedef unsigned char uch;
42typedef uch FAR uchf; 44typedef uch FAR uchf;