aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--configure.in2
-rw-r--r--xtract/libxtract.h4
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 098302d..003bfaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 --git a/configure.in b/configure.in
index a653540..84b197b 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ m4_define(libxtract_major_version, 0)
# 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 --git a/xtract/libxtract.h b/xtract/libxtract.h
index 5931351..6e76ff3 100644
--- a/xtract/libxtract.h
+++ b/xtract/libxtract.h
@@ -176,14 +176,14 @@ printf("Mean = %.2f\n", mean);
*
*/
#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 */