diff options
| author | joerg <joerg> | 2013-04-29 21:12:36 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2013-04-29 21:12:36 +0000 |
| commit | f8c4bdd67fd35f1a12a3bfe1905a623c87a95d72 (patch) | |
| tree | f588a1f3749a9b4de13758cd62e033018526d737 /audio | |
| parent | bfe603319161a1a5717ff824b61785c4188ff05d (diff) | |
| download | pkgsrc-f8c4bdd67fd35f1a12a3bfe1905a623c87a95d72.tar.gz | |
Don't use macro names from the implementation namespace.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/festival/distinfo | 3 | ||||
| -rw-r--r-- | audio/festival/patches/patch-speech__tools_include_EST__error.h | 30 |
2 files changed, 32 insertions, 1 deletions
diff --git a/audio/festival/distinfo b/audio/festival/distinfo index 17af9046f76..cc3eb232e7b 100644 --- a/audio/festival/distinfo +++ b/audio/festival/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2012/12/18 13:27:10 jperkin Exp $ +$NetBSD: distinfo,v 1.20 2013/04/29 21:12:36 joerg Exp $ SHA1 (festival-2.1-release.tar.gz) = f0c5a4282667898c584516e3605742835f59cb77 RMD160 (festival-2.1-release.tar.gz) = b3c646ecc532e4e05f846db06bbab12a13ec1d6b @@ -21,6 +21,7 @@ SHA1 (patch-speech__tools_config_rules_compile__options.mak) = d3aa93029edba84f8 SHA1 (patch-speech__tools_include_EST__SCFG.h) = d58bc030dec4d526a89719e32c3624c642f33f3e SHA1 (patch-speech__tools_include_EST__TIterator.h) = db7617f5c4a802672ce3b098ecd512b6cdb96aeb SHA1 (patch-speech__tools_include_EST__TNamedEnum.h) = f240a338d17d7a36a5dba1b0f3b48190b235bf03 +SHA1 (patch-speech__tools_include_EST__error.h) = 26c99948bee89f11b39efbb9d6eb195e1fb1602d SHA1 (patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = ec5eb54fba5a50b43d1a0c9f0a5ae36407f55bff SHA1 (patch-speech__tools_include_unix_EST__socket__unix.h) = f81c0cda0858d121e2d24182f39c7ab8fc673174 SHA1 (patch-speech__tools_stats_dynamic__program.cc) = d932f865d5c5577f7c1adc446adf9a2ab25c59c9 diff --git a/audio/festival/patches/patch-speech__tools_include_EST__error.h b/audio/festival/patches/patch-speech__tools_include_EST__error.h new file mode 100644 index 00000000000..95c90a9385b --- /dev/null +++ b/audio/festival/patches/patch-speech__tools_include_EST__error.h @@ -0,0 +1,30 @@ +$NetBSD: patch-speech__tools_include_EST__error.h,v 1.1 2013/04/29 21:12:37 joerg Exp $ + +--- speech_tools/include/EST_error.h.orig 2013-04-28 06:54:36.000000000 +0000 ++++ speech_tools/include/EST_error.h +@@ -84,19 +84,19 @@ void EST_quiet_error_fn(const char *form + void EST_quiet_sys_error_fn(const char *format, ...); + + +-#define __S_(X) #X +-#define __s_(X) __S_(X) ++#define STR_(X) #X ++#define str_(X) STR_(X) + +-#define EST_bug (EST_error_where = __FILE__ ", line " __s_(__LINE__)),\ ++#define EST_bug (EST_error_where = __FILE__ ", line " str_(__LINE__)),\ + (*EST_bug_func) + + #if defined(EST_DEBUGGING) + #define EST_exit(N) abort() +-#define EST_error (EST_error_where = __FILE__ ", line " __s_(__LINE__)),\ ++#define EST_error (EST_error_where = __FILE__ ", line " str_(__LINE__)),\ + (*EST_error_func) +-#define EST_warning (EST_error_where = __FILE__ ", line " __s_(__LINE__)),\ ++#define EST_warning (EST_error_where = __FILE__ ", line " str_(__LINE__)),\ + (*EST_warning_func) +-#define EST_sys_error (EST_error_where = __FILE__ ", line " __s_(__LINE__)),\ ++#define EST_sys_error (EST_error_where = __FILE__ ", line " str_(__LINE__)),\ + (*EST_sys_error_func) + #else + |