From: Chris Lundquist <chris.lundquist@bluebox.net>
Date: Thu, 11 Oct 2012 00:04:26 +0000 (-0700)
Subject: network.c: workaround for broken OSX compilers issuing false warnings
X-Git-Tag: collectd-5.0.5~2^2~1
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=ae76b092e5836b9c3ca0267896e6b439e6ea8c2c;p=collectd.git

network.c: workaround for broken OSX compilers issuing false warnings

Signed-off-by: Florian Forster <octo@collectd.org>
---

diff --git a/src/network.c b/src/network.c
index be222769..570b9d4f 100644
--- a/src/network.c
+++ b/src/network.c
@@ -59,7 +59,18 @@
 
 #if HAVE_LIBGCRYPT
 # include <pthread.h>
+# if defined __APPLE__
+/* default xcode compiler throws warnings even when deprecated functionality
+ * is not used. -Werror breaks the build because of erroneous warnings.
+ * http://stackoverflow.com/questions/10556299/compiler-warnings-with-libgcrypt-v1-5-0/12830209#12830209
+ */
+#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+# endif
 # include <gcrypt.h>
+# if defined __APPLE__
+/* Re enable deprecation warnings */
+#  pragma GCC diagnostic warning "-Wdeprecated-declarations"
+# endif
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #endif
 
@@ -661,7 +672,7 @@ static int write_part_number (char **ret_buffer, int *ret_buffer_len,
 
 	part_header_t pkg_head;
 	uint64_t pkg_value;
-	
+
 	int offset;
 
 	packet_len = sizeof (pkg_head) + sizeof (pkg_value);
@@ -2698,7 +2709,7 @@ static int add_to_buffer (char *buffer, int buffer_size, /* {{{ */
 			return (-1);
 		sstrncpy (vl_def->type_instance, vl->type_instance, sizeof (vl_def->type_instance));
 	}
-	
+
 	if (write_part_values (&buffer, &buffer_size, ds, vl) != 0)
 		return (-1);
 
@@ -3413,7 +3424,7 @@ static int network_init (void)
 	return (0);
 } /* int network_init */
 
-/* 
+/*
  * The flush option of the network plugin cannot flush individual identifiers.
  * All the values are added to a buffer and sent when the buffer is full, the
  * requested value may or may not be in there, it's not worth finding out. We