projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rrdcached: pull in rrd_config.h so we can use its defines
[rrdtool.git]
/
src
/
rrd_daemon.c
diff --git
a/src/rrd_daemon.c
b/src/rrd_daemon.c
index
bee21a2
..
c6211a6
100644
(file)
--- a/
src/rrd_daemon.c
+++ b/
src/rrd_daemon.c
@@
-62,7
+62,16
@@
/*
* Now for some includes..
*/
/*
* Now for some includes..
*/
-#include "rrd.h" /* {{{ */
+/* {{{ */
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__) && !defined(HAVE_CONFIG_H)
+#include "../win32/config.h"
+#else
+#ifdef HAVE_CONFIG_H
+#include "../rrd_config.h"
+#endif
+#endif
+
+#include "rrd.h"
#include "rrd_client.h"
#include <stdlib.h>
#include "rrd_client.h"
#include <stdlib.h>
@@
-1450,7
+1459,7
@@
static int handle_request_update (listen_socket_t *sock, /* {{{ */
wipe_ci_values(ci, now);
ci->flags = CI_FLAGS_IN_TREE;
wipe_ci_values(ci, now);
ci->flags = CI_FLAGS_IN_TREE;
-
ci->flushed = PTHREAD_COND_INITIALIZER
;
+
pthread_cond_init(&ci->flushed, NULL)
;
pthread_mutex_lock(&cache_lock);
g_tree_insert (cache_tree, (void *) ci->file, (void *) ci);
pthread_mutex_lock(&cache_lock);
g_tree_insert (cache_tree, (void *) ci->file, (void *) ci);