From: Richard W.M. Jones <rjones@redhat.com>
Date: Mon, 20 Jun 2011 09:35:02 +0000 (+0100)
Subject: Enable deprecated option only with gcc >= 4.5.
X-Git-Tag: 1.11.11~1
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=9287197a85a7b51167a3b6c289a129760e6f9936;hp=cabfaa857fbd325bd0303fa56b28df8ce52aab33

Enable deprecated option only with gcc >= 4.5.

Before gcc 4.5, the deprecated option did not take the optional string
argument (see [1]).  This caused compilation to fail with gcc < 4.5.

[1] http://gcc.gnu.org/gcc-4.5/changes.html
---

diff --git a/generator/generator_c.ml b/generator/generator_c.ml
index 771d6a2..8208306 100644
--- a/generator/generator_c.ml
+++ b/generator/generator_c.ml
@@ -373,7 +373,7 @@ extern \"C\" {
 /* Define GUESTFS_WARN_DEPRECATED=1 to warn about deprecated API functions. */
 #define GUESTFS_DEPRECATED_BY(s)
 #if GUESTFS_WARN_DEPRECATED
-#  if defined(__GNUC__) && GUESTFS_GCC_VERSION >= 30100 /* gcc >= 3.1.0 */
+#  if defined(__GNUC__) && GUESTFS_GCC_VERSION >= 40500 /* gcc >= 4.5 */
 #    undef GUESTFS_DEPRECATED_BY
 #    define GUESTFS_DEPRECATED_BY(s) __attribute__((__deprecated__(\"change the program to use guestfs_\" s \" instead of this deprecated function\")))
 #  endif