# HG changeset patch
# User Jamie Bullock <jamie@postlude.co.uk>
# Date 1163159528 0
# Node ID d8e72a79b86b55231d04924395c3670be7facd41
# Parent  3af08ec9091a936dbf70723f741839e2783e4769
Fixed Mac OS X crash by declaring xtract and xtract_help_strings as
extern

diff -r 3af08ec9091a -r d8e72a79b86b ChangeLog
--- a/ChangeLog	Tue Oct 24 08:55:44 2006 +0000
+++ b/ChangeLog	Fri Nov 10 11:52:08 2006 +0000
@@ -1,3 +1,7 @@
+2006-11-10 Jamie Bullock <jamie@postlude.co.uk>
+    * version 0.2.2
+	* Fixed 'bus error' crash on Mac OS X by adding 'extern' declarations
+	to xtract and xtract_help_strings	
 2006-10-24 Jamie Bullock <jamie@postlude.co.uk>
     * version 0.2.1
 	* Fixed _xtract and _xtract_help_strings memory alloc bug
diff -r 3af08ec9091a -r d8e72a79b86b configure.in
--- a/configure.in	Tue Oct 24 08:55:44 2006 +0000
+++ b/configure.in	Fri Nov 10 11:52:08 2006 +0000
@@ -4,7 +4,7 @@
 # Increment for feature additions and enhancements
 m4_define(libxtract_minor_version, 2)
 # Increment for fixes 
-m4_define(libxtract_fix_version, 1)
+m4_define(libxtract_fix_version, 2)
 
 m4_define(libxtract_version, libxtract_major_version.libxtract_minor_version.libxtract_fix_version)
 		
diff -r 3af08ec9091a -r d8e72a79b86b xtract/libxtract.h
--- a/xtract/libxtract.h	Tue Oct 24 08:55:44 2006 +0000
+++ b/xtract/libxtract.h	Fri Nov 10 11:52:08 2006 +0000
@@ -176,14 +176,14 @@
  * 
  */
 #ifdef XTRACT
-int(*xtract[XTRACT_FEATURES])(float *data, int N, void *argv, float *result);
+extern int(*xtract[XTRACT_FEATURES])(float *data, int N, void *argv, float *result);
 
 
 /** \brief An array of pointers to function help strings
  *
  * Defined in libxtract.c. As a minimum this will contain pointers to the names of all of the feature extraction functions in the library. This is intended as a 'quick reference' to be queried as necessary.
  */
-char *xtract_help_strings[XTRACT_FEATURES];
+extern char *xtract_help_strings[XTRACT_FEATURES];
 #endif
 
 /** \brief A structure to store a set of n_filters Mel filters */