[cairo-commit] 2 commits - src/check-def.sh src/Makefile.am util/malloc-stats.c

[Behdad Esfahbod]

 src/Makefile.am     |    2 +-
 src/check-def.sh    |    3 ++-
 util/malloc-stats.c |    5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c26084a45fcb6ac467cad8bdcedfb2f524b857fc
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Dec 10 14:38:09 2007 -0500

    Pass $(MAKE) to test shell scripts (#13591)

diff --git a/src/Makefile.am b/src/Makefile.am
index 4492e6a..17cf681 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -314,7 +314,7 @@ install-data-local:
 	  false ;									\
         fi
 
-TESTS_ENVIRONMENT = srcdir="$(srcdir)"
+TESTS_ENVIRONMENT = srcdir="$(srcdir)" MAKE="$(MAKE)"
 TESTS = check-def.sh check-plt.sh check-headers.sh check-cairoint.sh
 EXTRA_DIST += $(TESTS)
 
diff --git a/src/check-def.sh b/src/check-def.sh
index 6f4d3f3..58408ef 100755
--- a/src/check-def.sh
+++ b/src/check-def.sh
@@ -8,6 +8,7 @@ if ! which nm 2>/dev/null >/dev/null; then
 fi
 
 test -z "$srcdir" && srcdir=.
+test -z "$MAKE" && MAKE=make
 status=0
 
 get_cairo_syms='nm "$so" | grep " T " | cut -d" " -f3'
@@ -16,7 +17,7 @@ if [ "`uname -s`" = "Linux" ]; then
 fi
 
 defs="cairo.def"
-make $defs
+$MAKE $defs
 for def in $defs; do
 	lib=`echo "$def" | sed 's/[.]def$//'`
 	lib=`echo "$lib" | sed 's at .*/@@'`
commit 78dac47399038cc9a05b82b01c4e4b35132f0784
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Dec 3 02:31:40 2007 -0500

    [util/malloc-stats.c] Add a public function malloc_stats()
    
    Apparently glibc already provides the function:
    
      void malloc_stats (void);
    
    So, like we do for backtrace_symbols(), override the public symbol.
    It still is defined as __destructor__ and runs at program finalization.

diff --git a/util/malloc-stats.c b/util/malloc-stats.c
index 77c2f33..59a7887 100644
--- a/util/malloc-stats.c
+++ b/util/malloc-stats.c
@@ -275,8 +275,8 @@ merge_similar_entries (void)
 }
 
 __attribute__ ((destructor))
-static void
-finish (void)
+void
+malloc_stats (void)
 {
 	int i;
 
@@ -298,4 +298,3 @@ finish (void)
 		}
 	}
 }
-