From: Pierre-Yves Ritschard <pyr@spootnik.org>
Date: Wed, 5 Aug 2015 09:07:27 +0000 (+0200)
Subject: Merge pull request #1178 from rubenk/fix-libmodbus-compilation-on-freebsd
X-Git-Tag: collectd-5.6.0~618
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=594aa45c1df64eadae54c415524f3a267c12d7f8;p=collectd.git

Merge pull request #1178 from rubenk/fix-libmodbus-compilation-on-freebsd

core: include <sys/socket.h> in collectd.h
---

594aa45c1df64eadae54c415524f3a267c12d7f8
diff --cc src/write_graphite.c
index f82f852f,997a8877..7fc9eb9f
--- a/src/write_graphite.c
+++ b/src/write_graphite.c
@@@ -54,19 -54,36 +54,18 @@@
  /* Folks without pthread will need to disable this plugin. */
  #include <pthread.h>
  
- #include <sys/socket.h>
  #include <netdb.h>
  
 -#ifndef WG_DEFAULT_NODE
 -# define WG_DEFAULT_NODE "localhost"
 -#endif
 -
 -#ifndef WG_DEFAULT_SERVICE
 -# define WG_DEFAULT_SERVICE "2003"
 -#endif
 -
 -#ifndef WG_DEFAULT_PROTOCOL
 -# define WG_DEFAULT_PROTOCOL "tcp"
 -#endif
 -
 -#ifndef WG_DEFAULT_LOG_SEND_ERRORS
 -# define WG_DEFAULT_LOG_SEND_ERRORS 1
 -#endif
 -
 -#ifndef WG_DEFAULT_ESCAPE
 -# define WG_DEFAULT_ESCAPE '_'
 -#endif
 +#define WG_DEFAULT_NODE "localhost"
 +#define WG_DEFAULT_SERVICE "2003"
 +#define WG_DEFAULT_PROTOCOL "tcp"
 +#define WG_DEFAULT_LOG_SEND_ERRORS 1
 +#define WG_DEFAULT_ESCAPE '_'
  
  /* Ethernet - (IPv6 + TCP) = 1500 - (40 + 32) = 1428 */
 -#ifndef WG_SEND_BUF_SIZE
 -# define WG_SEND_BUF_SIZE 1428
 -#endif
 +#define WG_SEND_BUF_SIZE 1428
  
 -#ifndef WG_MIN_RECONNECT_INTERVAL
 -# define WG_MIN_RECONNECT_INTERVAL TIME_T_TO_CDTIME_T (1)
 -#endif
 +#define WG_MIN_RECONNECT_INTERVAL TIME_T_TO_CDTIME_T (1)
  
  /*
   * Private variables