[PATCH] Added large file support ("backported" to collectd-3).

This adds large file support to collectd by using the AC_SYS_LARGEFILE macro
in configure.in. In order to apply any necessary options to all parts of
collectd, we have to make sure config.h is included in all source files
(either directly or by including collectd.h) and before any other header files
are included.

This should fix http://bugs.debian.org/422212.

Signed-off-by: Sebastian Harl <sh@tokkee.org>

diff --git a/configure.in b/configure.in
index 0f6d3c092174cb5a320f80602e93c7c6d7f833f2..9fe842ace930bce4225e955becc3fe56976ab3f1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7,6 +7,8 @@ AC_LANG(C)
 
 AC_PREFIX_DEFAULT("/opt/collectd")
 
+AC_SYS_LARGEFILE
+
 #
 # Checks for programs.
 #

diff --git a/src/common.c b/src/common.c
index 5487b326fd34ac31eb8adfe20fa6971ecd0c4fec..e7d561fd447662f706b3003786d617fa5722fcfe 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -22,6 +22,10 @@
  *   Niki W. Waibel <niki.waibel@gmx.net>
 **/
 
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "common.h"
 #include "utils_debug.h"
 

diff --git a/src/multimeter.c b/src/multimeter.c
index 46438bf37beb6566207aede99b388fb2bce7d8d2..09073abab2d7449804e764151d45b028238e671a 100644 (file)
--- a/src/multimeter.c
+++ b/src/multimeter.c
@@ -23,13 +23,14 @@
  *
  **/
 
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <math.h>
 #include "collectd.h"
 #include "common.h"
 #include "plugin.h"
 
+#include <termios.h>
+#include <sys/ioctl.h>
+#include <math.h>
+
 #define MODULE_NAME "multimeter"
 
 static char *multimeter_file = "multimeter.rrd";

diff --git a/src/network.c b/src/network.c
index e9ba84bb4210037f0cae97a6612c3fe0ef319bb6..f2908d3c2c6ddedbe47501fb896e9b4a1f8c839c 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -20,6 +20,10 @@
  *   Florian octo Forster <octo at verplant.org>
  **/
 
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/src/utils_debug.c b/src/utils_debug.c
index 9fc9040b23ff74ee16be33305174d9cada4e1fe7..067af21cf3dfc64d4bf2fed1beb71df212b40780 100644 (file)
--- a/src/utils_debug.c
+++ b/src/utils_debug.c
@@ -20,6 +20,10 @@
  *   Niki W. Waibel <niki.waibel at gmx.net>
  **/
 
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "common.h"
 #include "utils_debug.h"
 

diff --git a/src/utils_ignorelist.c b/src/utils_ignorelist.c
index 532eb4b0029837318cf60a2adbecf901a2590b3a..7f9e5c6d7adcdffdc092c3c75992f829a906faff 100644 (file)
--- a/src/utils_ignorelist.c
+++ b/src/utils_ignorelist.c
@@ -47,6 +47,10 @@
  *     return;
  **/
 
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include "common.h"
 #include "utils_debug.h"
 #include "utils_ignorelist.h"

diff --git a/src/utils_mount.c b/src/utils_mount.c
index 7748c610bc871faf99a2f75a30f6db99e6c6fbbb..0e1a5c9c3565e9e899fa6c02bb40ba59c2bf191e 100644 (file)
--- a/src/utils_mount.c
+++ b/src/utils_mount.c
@@ -21,7 +21,9 @@
  *   Niki W. Waibel <niki.waibel@gmx.net>
 **/
 
-
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include "common.h"
 #if HAVE_XFS_XQM_H