summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--zlib/ChangeLog.gcj4
-rw-r--r--zlib/zconf.h8
2 files changed, 12 insertions, 0 deletions
diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index 5569030bb7d..39e5a0d118c 100644
--- a/zlib/ChangeLog.gcj
+++ b/zlib/ChangeLog.gcj
@@ -1,3 +1,7 @@
+2004-11-22 Eric Botcazou <ebotcazou@libertysurf.fr>
+
+ * zconf.h: Define NO_vsnprintf on Solaris 2.5.1.
+
2004-10-11 Tom Tromey <tromey@redhat.com>
PR libgcj/14856:
diff --git a/zlib/zconf.h b/zlib/zconf.h
index 831285e8efb..96dbc205c91 100644
--- a/zlib/zconf.h
+++ b/zlib/zconf.h
@@ -320,4 +320,12 @@ typedef uLong FAR uLongf;
# pragma map(inflate_copyright,"INCOPY")
#endif
+/* Solaris 2.5.1 doesn't have vsnprintf */
+#if defined(__sun) && defined(__svr4__)
+#include <sys/feature_tests.h>
+#if _XOPEN_VERSION < 3
+#define NO_vsnprintf
+#endif
+#endif
+
#endif /* ZCONF_H */