diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2009-10-23 01:54:41 +0400 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2009-10-23 01:55:02 +0400 |
| commit | 6cde32bf0195b6b01f7e3e8be9a5f2c3dd2ae60a (patch) | |
| tree | a331972c9926200c8b961852441e35d84f56ca4e /speexbuild | |
| parent | af09b095d8c495ebac8728033490ae4b61d0631a (diff) | |
Remove custom speex fatal handler as well.
Diffstat (limited to 'speexbuild')
| -rw-r--r-- | speexbuild/os_support_custom.h | 23 | ||||
| -rw-r--r-- | speexbuild/speexbuild.pro | 4 |
2 files changed, 0 insertions, 27 deletions
diff --git a/speexbuild/os_support_custom.h b/speexbuild/os_support_custom.h deleted file mode 100644 index 37bfe876c..000000000 --- a/speexbuild/os_support_custom.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef _SPEEX_SUPPORT_MUMBLE -#define _SPEEX_SUPPORT_MUMBLE - -#ifdef __APPLE__ - -#include <stdio.h> - -#define OVERRIDE_SPEEX_FATAL - -extern mumble_macx_speex_fatal(const char *str, const char *file, int line); - -static inline void _speex_fatal(const char *str, const char *file, int line) { - if (! mumble_macx_speex_fatal) { - fprintf(stderr, "Fatal (internal) libspeex error in %s, line %d: %s\n", file, line, str); - abort(); - } - - mumble_macx_speex_fatal(str, file, line); -} - -#endif /* __APPLE__ */ - -#endif /* _SPEEX_SUPPORT_MUMBLE */ diff --git a/speexbuild/speexbuild.pro b/speexbuild/speexbuild.pro index 024dd9548..02c92ab7b 100644 --- a/speexbuild/speexbuild.pro +++ b/speexbuild/speexbuild.pro @@ -33,10 +33,6 @@ win32 { INCLUDEPATH += ../speexbuild } -macx { - DEFINES += OS_SUPPORT_CUSTOM -} - DIST = config.h speex.def speex/speex_config_types.h DEF_FILE = speex.def |