From: Florian Forster <octo@collectd.org>
Date: Sat, 17 Nov 2012 11:41:00 +0000 (+0100)
Subject: Merge branch 'collectd-4.10' into collectd-5.0
X-Git-Tag: collectd-5.2.0~7^2^2
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=cc0bb2b472628ccede974a02c822d1f9189f0d21;hp=494386dffbab10af47c08846e6e3fec2b2ae5107

Merge branch 'collectd-4.10' into collectd-5.0
---

diff --git a/src/network.c b/src/network.c
index 1f8fe0ad..3f0c6fa1 100644
--- a/src/network.c
+++ b/src/network.c
@@ -66,6 +66,11 @@
  */
 #  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 # endif
+/* FreeBSD's copy of libgcrypt extends the existing GCRYPT_NO_DEPRECATED
+ * to properly hide all deprecated functionality.
+ * http://svnweb.freebsd.org/ports/head/security/libgcrypt/files/patch-src__gcrypt.h.in
+ */
+# define GCRYPT_NO_DEPRECATED
 # include <gcrypt.h>
 # if defined __APPLE__
 /* Re enable deprecation warnings */