Merge branch 'ff/types' into collectd-4

diff --combined src/rrdtool.c
index f71ba1a,7395bcd..52557c0
--- 1/src/rrdtool.c
--- 2/src/rrdtool.c
+++ b/src/rrdtool.c
@@@ -1,6 -1,6 +1,6 @@@
  /**
   * collectd - src/rrdtool.c
 - * Copyright (C) 2006  Florian octo Forster
 + * Copyright (C) 2006,2007  Florian octo Forster
   *
   * This program is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License as published by the
@@@ -870,7 -870,7 +870,7 @@@ static int rrd_init (void
        return (0);
  } /* int rrd_init */
  
- void module_register (modreg_e load)
+ void module_register (void)
  {
        plugin_register_config ("rrdtool", rrd_config,
                        config_keys, config_keys_num);