projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3339 from jkohen/patch-1
[collectd.git]
/
src
/
daemon
/
collectd.h
diff --git
a/src/daemon/collectd.h
b/src/daemon/collectd.h
index
459da4d
..
07597d3
100644
(file)
--- a/
src/daemon/collectd.h
+++ b/
src/daemon/collectd.h
@@
-27,6
+27,11
@@
#ifndef COLLECTD_H
#define COLLECTD_H
#ifndef COLLECTD_H
#define COLLECTD_H
+#ifdef WIN32
+typedef int uid_t;
+#include "gnulib_config.h"
+#endif
+
#if HAVE_CONFIG_H
#include "config.h"
#endif
#if HAVE_CONFIG_H
#include "config.h"
#endif
@@
-122,6
+127,10
@@
#include <sys/isa_defs.h>
#endif
#include <sys/isa_defs.h>
#endif
+#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
#ifndef BYTE_ORDER
#if defined(_BYTE_ORDER)
#define BYTE_ORDER _BYTE_ORDER
#ifndef BYTE_ORDER
#if defined(_BYTE_ORDER)
#define BYTE_ORDER _BYTE_ORDER
@@
-183,10
+192,6
@@
#endif
#endif
#endif
#endif
-#if HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
#ifndef PACKAGE_NAME
#define PACKAGE_NAME "collectd"
#endif
#ifndef PACKAGE_NAME
#define PACKAGE_NAME "collectd"
#endif