diff options
| author | Jason W. Bacon <jwb@FreeBSD.org> | 2020-04-24 19:22:03 +0000 |
|---|---|---|
| committer | Jason W. Bacon <jwb@FreeBSD.org> | 2020-04-24 19:22:03 +0000 |
| commit | 9b3ea45e5b615b028b14991c749447d9e25c35ea (patch) | |
| tree | 87a0b73a0ede1dc971145cf236f1a3db771ffd3f /audio/praat/files/patch-sys_melder.h | |
| parent | security/lego: Update to 3.6.0 (diff) | |
audio/praat: Upgrade to 6.1.13
Clean up patches
Switch from OSS to ALSA (upstream default)
Left in and documented patches to ease switch to OSS or JACK in case of
runtime issues
Releasing maintainership as I no longer work with any praat users
Reported by: portscout
Diffstat (limited to 'audio/praat/files/patch-sys_melder.h')
| -rw-r--r-- | audio/praat/files/patch-sys_melder.h | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/audio/praat/files/patch-sys_melder.h b/audio/praat/files/patch-sys_melder.h deleted file mode 100644 index f90bdd43c20a..000000000000 --- a/audio/praat/files/patch-sys_melder.h +++ /dev/null @@ -1,81 +0,0 @@ ---- sys/melder.h.orig 2015-05-20 01:47:31 UTC -+++ sys/melder.h -@@ -51,6 +51,8 @@ - #define INT54_MIN -9007199254740991LL - #endif - -+#include <uchar.h> -+ - typedef wchar_t wchar; - typedef uint8_t char8_t; - typedef char32_t char32; -@@ -222,7 +224,7 @@ static inline int64_t str16len (const ch - return (int64_t) wcslen ((const wchar_t *) string); - } else { - int64_t result = 0; -- while (* string ++ != u'\0') result ++; -+ while (* string ++ != (char16_t)'\0') result ++; - return result; - } - } -@@ -230,8 +232,8 @@ static inline void str16cpy (char16_t *t - if (sizeof (wchar_t) == 2) { - wcscpy ((wchar_t *) target, (const wchar_t *) source); - } else { -- while (* source != u'\0') * target ++ = * source ++; -- * target = u'\0'; -+ while (* source != (char16_t)'\0') * target ++ = * source ++; -+ * target = (char16_t)'\0'; - } - } - static inline int str16cmp (const char16_t *string1, const char16_t *string2) { -@@ -239,7 +241,7 @@ static inline int str16cmp (const char16 - return wcscmp ((const wchar_t *) string1, (const wchar_t *) string2); - } else { - while (*string1 == *string2 ++) { -- if (*string1 ++ == u'\0') { -+ if (*string1 ++ == (char16_t)'\0') { - return 0; - } - } -@@ -251,7 +253,7 @@ static inline int64_t str32len (const ch - return (int64_t) wcslen ((const wchar_t *) string); - } else { - int64_t result = 0; -- while (* string ++ != U'\0') result ++; -+ while (* string ++ != (char32_t)'\0') result ++; - return result; - } - } -@@ -259,8 +261,8 @@ static inline void str32cpy (char32_t *t - if (sizeof (wchar_t) == 4) { - wcscpy ((wchar_t *) target, (const wchar_t *) source); - } else { -- while (* source != U'\0') * target ++ = * source ++; -- * target = U'\0'; -+ while (* source != (char32_t)'\0') * target ++ = * source ++; -+ * target = (char32_t)'\0'; - } - } - static inline int str32cmp (const char32_t *string1, const char32_t *string2) { -@@ -268,7 +270,7 @@ static inline int str32cmp (const char32 - return wcscmp ((const wchar_t *) string1, (const wchar_t *) string2); - } else { - while (*string1 == *string2 ++) { -- if (*string1 ++ == U'\0') { -+ if (*string1 ++ == (char32_t)'\0') { - return 0; - } - } -@@ -1171,6 +1173,11 @@ public: - Melder_fclose (file, tmp); - } - } -+ // operator () is not working in Sound_files.cpp:226 for some reason -+ FILE * get_ptr(void) -+ { -+ return ptr; -+ } - }; - - class autoMelderFile { |
