Merge branch 'hotfixes-2.3.5'

8 files changed, 16 insertions, 7 deletions

diff --git a/bindings/ghashtable.h b/bindings/ghashtable.h
index ef9133f1..a41a59f2 100644
--- a/bindings/ghashtable.h
+++ b/bindings/ghashtable.h
@@ -34,7 +34,7 @@ static gboolean return_true(G_GNUC_UNUSED gpointer a, G_GNUC_UNUSED gpointer b,
 	return TRUE;
 }
 
-static void
+G_GNUC_UNUSED static void
 g_hash_table_remove_all (GHashTable *hash_table)
 {
     lasso_return_if_fail(hash_table != NULL);
@@ -46,7 +46,7 @@ g_hash_table_remove_all (GHashTable *hash_table)
    * (as this function is useful but new in 2.14) */
 
 
-static GList *
+G_GNUC_UNUSED static GList *
 g_hash_table_get_keys (GHashTable *hash_table)
 {
   GHashNode *node;
@@ -63,7 +63,7 @@ g_hash_table_get_keys (GHashTable *hash_table)
   return retval;
 }
 
-static GList *
+G_GNUC_UNUSED static GList *
 g_hash_table_get_values (GHashTable *hash_table)
 {
     GHashNode *node;
diff --git a/bindings/perl/ghashtable_handling.c b/bindings/perl/ghashtable_handling.c
index 541041d8..8479a59e 100644
--- a/bindings/perl/ghashtable_handling.c
+++ b/bindings/perl/ghashtable_handling.c
@@ -119,6 +119,6 @@ get_hash_of_objects(GHashTable *hash)
 	HV *hv;
 
 	hv = newHV();
-	g_hash_table_foreach(hash, __ht_foreach_get_hos, hv);
+	g_hash_table_foreach(hash, __ht_foreach_get_hoo, hv);
 	return hv;
 }
diff --git a/bindings/php5/tests/Makefile.am b/bindings/php5/tests/Makefile.am
index b2d8549e..bb20cf01 100644
--- a/bindings/php5/tests/Makefile.am
+++ b/bindings/php5/tests/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 if PHP5_ENABLED
-TESTS_ENVIRONMENT=env "SRCDIR=$(srcdir)/"
+TESTS_ENVIRONMENT=env "SRCDIR=$(srcdir)/" "PHP5=$(PHP5)"
 TESTS = profile_tests.sh binding_tests.sh
 endif
 
diff --git a/bindings/php5/tests/binding_tests.sh b/bindings/php5/tests/binding_tests.sh
index 3bfad5d6..0971ab2b 100755
--- a/bindings/php5/tests/binding_tests.sh
+++ b/bindings/php5/tests/binding_tests.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php5 -n -d extension_dir=../.libs -d extension=lasso.so ${SRCDIR}binding_tests.php
+${PHP5:?PHP5 variable is not defined} -n -d extension_dir=../.libs -d extension=lasso.so ${SRCDIR}binding_tests.php
diff --git a/bindings/php5/tests/profile_tests.sh b/bindings/php5/tests/profile_tests.sh
index 08a53fac..f7298079 100755
--- a/bindings/php5/tests/profile_tests.sh
+++ b/bindings/php5/tests/profile_tests.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-php5 -n -d extension_dir=../.libs -d extension=lasso.so ${SRCDIR}profile_tests.php
+${PHP5:?PHP5 variable is not defined} -n -d extension_dir=../.libs -d extension=lasso.so ${SRCDIR}profile_tests.php
diff --git a/bindings/python/tests/binding_tests.py b/bindings/python/tests/binding_tests.py
index 89039d2e..ba732f37 100755
--- a/bindings/python/tests/binding_tests.py
+++ b/bindings/python/tests/binding_tests.py
@@ -28,6 +28,9 @@
 import unittest
 import sys
 import os
+import logging
+
+logging.basicConfig()
 
 if not '..' in sys.path:
     sys.path.insert(0, '..')
diff --git a/bindings/python/tests/idwsf1_tests.py b/bindings/python/tests/idwsf1_tests.py
index cf47f46a..9ace6200 100755
--- a/bindings/python/tests/idwsf1_tests.py
+++ b/bindings/python/tests/idwsf1_tests.py
@@ -25,6 +25,9 @@
 import os
 import unittest
 import sys
+import logging
+
+logging.basicConfig()
 
 if not '..' in sys.path:
     sys.path.insert(0, '..')
diff --git a/bindings/python/tests/idwsf2_tests.py b/bindings/python/tests/idwsf2_tests.py
index cadb605f..6d43a428 100755
--- a/bindings/python/tests/idwsf2_tests.py
+++ b/bindings/python/tests/idwsf2_tests.py
@@ -29,6 +29,9 @@ import os
 import unittest
 import sys
 from StringIO import StringIO
+import logging
+
+logging.basicConfig()
 
 if not '..' in sys.path:
     sys.path.insert(0, '..')