Browse Source

resolve namespace clash

master
Olaf Rempel 11 years ago
parent
commit
49f3f7b571
3 changed files with 3 additions and 7 deletions
  1. +1
    -5
      rrdtool.c
  2. +1
    -1
      rrdtool.h
  3. +1
    -1
      sammler.c

+ 1
- 5
rrdtool.c View File

@@ -36,10 +36,6 @@

#define ARGCMAX 64
#define ARGVSIZE 1024

#define RRDTOOL_CREATE 1
#define RRDTOOL_UPDATE 2

#define BUFSIZE 1024

struct rra_cb_data {
@@ -50,7 +46,7 @@ struct rra_cb_data {

static const char *rrd_dir;

int rrd_init(void)
int sammler_rrd_init(void)
{
rrd_dir = config_get_string("global", "rrd_dir", ".");
return 0;


+ 1
- 1
rrdtool.h View File

@@ -1,7 +1,7 @@
#ifndef _RRDTOOL_H_
#define _RRDTOOL_H_

int rrd_init(void);
int sammler_rrd_init(void);
int rrd_submit(const char *hostname, const char *pluginname, const char *filename, int ds_id, const char *data);

#endif /* _RRDTOOL_H_ */

+ 1
- 1
sammler.c View File

@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
if (net_init())
exit(1);

if (rrd_init())
if (sammler_rrd_init())
exit(1);

if (plugin_init()) {


Loading…
Cancel
Save