From bedea2483b6cf0f5af0f50010031bb56f5512124 Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Wed, 26 Oct 2016 10:25:10 -0700 Subject: [PATCH] Clean up and comment the use of local for static. --- adler32.c | 2 -- crc32.c | 2 -- gzguts.h | 4 +++- zutil.h | 4 +++- 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 @@ #include "zutil.h" -#define local static - local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); #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 @@ #include "zutil.h" /* for STDC and FAR definitions */ -#define local static - /* Definitions for doing the crc four data bytes at a time. */ #if !defined(NOBYFOUR) && defined(Z_U4) # define BYFOUR diff --git a/gzguts.h b/gzguts.h index bb62175..4f83d6d 100644 --- a/gzguts.h +++ b/gzguts.h @@ -114,7 +114,9 @@ #ifndef local # define local static #endif -/* compile with -Dlocal if your debugger can't find static symbols */ +/* since "static" is used to mean two completely different things in C, we + define "local" for the non-static meaning of "static", for readability + (compile with -Dlocal if your debugger can't find static symbols) */ /* gz* functions always use library allocation functions */ #ifndef STDC diff --git a/zutil.h b/zutil.h index 9441a1e..96cc90f 100644 --- a/zutil.h +++ b/zutil.h @@ -36,7 +36,9 @@ #ifndef local # define local static #endif -/* compile with -Dlocal if your debugger can't find static symbols */ +/* since "static" is used to mean two completely different things in C, we + define "local" for the non-static meaning of "static", for readability + (compile with -Dlocal if your debugger can't find static symbols) */ typedef unsigned char uch; typedef uch FAR uchf;