From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 28 Dec 2007 18:04:45 +0000 (+0100)
Subject: Merge branch 'collectd-4.2'
X-Git-Tag: collectd-4.3.0beta0~50
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e8993811715b8d505a176e1f34985ac2b63791a2;p=collectd.git

Merge branch 'collectd-4.2'

Conflicts:

	bindings/Makefile.am
---

e8993811715b8d505a176e1f34985ac2b63791a2
diff --cc bindings/Makefile.am
index 45735722,16872e88..1c604e19
--- a/bindings/Makefile.am
+++ b/bindings/Makefile.am
@@@ -12,9 -11,16 +12,17 @@@ clean-local
  perl: perl/Makefile
  	$(MAKE) -C perl
  
- perl/Makefile: perl/Makefile.PL perl/Collectd/Makefile.PL \
- 		$(top_builddir)/config.status
 -perl/Makefile: .perl-directory-stamp perl/Makefile.PL perl/Collectd/Makefile.PL
++perl/Makefile: .perl-directory-stamp perl/Makefile.PL \
++	perl/Collectd/Makefile.PL $(top_builddir)/config.status
  	cd perl && @PERL@ Makefile.PL PREFIX=$(prefix) @PERL_BINDINGS_OPTIONS@
  
+ .perl-directory-stamp:
+ 	if test ! -d perl; then \
+ 	  mkdir -p perl/Collectd; \
+ 	  cp $(srcdir)/perl/{Collectd.pm,Makefile.PL} perl/; \
+ 	  cp $(srcdir)/perl/Collectd/{Unixsock.pm,Makefile.PL} perl/Collectd/; \
+ 	fi
+ 	touch $@
+ 
  .PHONY: perl
  
diff --cc src/utils_avltree.h
index 0fc8ea15,5d35af11..355ced24
--- a/src/utils_avltree.h
+++ b/src/utils_avltree.h
@@@ -77,10 -74,10 +77,10 @@@ void c_avl_destroy (c_avl_tree_t *t)
   *   `value'    Value to be stored.
   *
   * RETURN VALUE
 - *   Zero upon success and non-zero upon failure and if the key is already
 - *   stored in the tree.
 + *   Zero upon success, non-zero otherwise. It's less than zero if an error
 + *   occurred or greater than zero if the key is already stored in the tree.
   */
- int avl_insert (avl_tree_t *t, void *key, void *value);
+ int c_avl_insert (c_avl_tree_t *t, void *key, void *value);
  
  /*
   * NAME