From 6715208bdb5087ae33a54f7e8150e020aebbf15d Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
Date: Sun, 13 Nov 2011 13:35:02 -0800
Subject: 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.
---
 zconf.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'zconf.h')

diff --git a/zconf.h b/zconf.h
index fd10c6a..84ffb32 100644
--- a/zconf.h
+++ b/zconf.h
@@ -266,11 +266,11 @@
 #  endif
 #endif
 
-#ifndef ON /* function prototypes for stdarg */
+#ifndef Z_ARG /* function prototypes for stdarg */
 #  if defined(STDC) || defined(Z_HAVE_STDARG_H)
-#    define ON(args)  args
+#    define Z_ARG(args)  args
 #  else
-#    define ON(args)  ()
+#    define Z_ARG(args)  ()
 #  endif
 #endif
 
-- 
cgit v1.2.3-55-g6feb