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.

3 files changed, 9 insertions, 9 deletions

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
 
diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index 0b880ad..b2d78b3 100644
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@@ -268,11 +268,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
 
diff --git a/zconf.h.in b/zconf.h.in
index fd10c6a..84ffb32 100644
--- a/zconf.h.in
+++ b/zconf.h.in
@@ -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