diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-11-13 13:35:02 -0800 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-11-13 13:35:02 -0800 |
commit | 6715208bdb5087ae33a54f7e8150e020aebbf15d (patch) | |
tree | beda2f73a3c6fb956523db0138a70a84c88137b4 /zconf.h.in | |
parent | d169dd73007cf1eadea79fb2c506b03f178a2bad (diff) | |
download | zlib-6715208bdb5087ae33a54f7e8150e020aebbf15d.tar.gz zlib-6715208bdb5087ae33a54f7e8150e020aebbf15d.tar.bz2 zlib-6715208bdb5087ae33a54f7e8150e020aebbf15d.zip |
Change ON macro to Z_ARG to avoid application conflicts.
Using "ON" was a dumb idea, since it is common to have macros with
names like ON and OFF. In fact, defining the OF macro back in 1995
was a bad idea, but now we're stuck with it. Attempts to rename OF
to something else breaks many applications.
Diffstat (limited to 'zconf.h.in')
-rw-r--r-- | zconf.h.in | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -266,11 +266,11 @@ | |||
266 | # endif | 266 | # endif |
267 | #endif | 267 | #endif |
268 | 268 | ||
269 | #ifndef ON /* function prototypes for stdarg */ | 269 | #ifndef Z_ARG /* function prototypes for stdarg */ |
270 | # if defined(STDC) || defined(Z_HAVE_STDARG_H) | 270 | # if defined(STDC) || defined(Z_HAVE_STDARG_H) |
271 | # define ON(args) args | 271 | # define Z_ARG(args) args |
272 | # else | 272 | # else |
273 | # define ON(args) () | 273 | # define Z_ARG(args) () |
274 | # endif | 274 | # endif |
275 | #endif | 275 | #endif |
276 | 276 | ||