projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge upstream, address conflict in src/utils/cmds/cmds_test.c
[collectd.git]
/
src
/
apcups.c
diff --git
a/src/apcups.c
b/src/apcups.c
index
4e84ebd
..
83a5c87
100644
(file)
--- a/
src/apcups.c
+++ b/
src/apcups.c
@@
-26,8
+26,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "
common.h" /* rrd_update_file
*/
-#include "
plugin.h" /* plugin_register, plugin_submit
*/
+#include "
plugin.h" /* plugin_register, plugin_submit
*/
+#include "
utils/common/common.h" /* rrd_update_file
*/
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
@@
-78,8
+78,8
@@
static bool conf_persistent_conn = true;
static int global_sockfd = -1;
static int global_sockfd = -1;
-static int count_retries
= 0
;
-static int count_iterations
= 0
;
+static int count_retries;
+static int count_iterations;
static int net_shutdown(int *fd) {
uint16_t packet_size = 0;
static int net_shutdown(int *fd) {
uint16_t packet_size = 0;