diff --git a/contrib/src/ass/libass-no-tchar.patch b/contrib/src/ass/libass-no-tchar.patch deleted file mode 100644 index 00eb8e3de8d441d2d50163ce6b488a98b925c276..0000000000000000000000000000000000000000 --- a/contrib/src/ass/libass-no-tchar.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- libass-0.15.2/libass/ass_fontselect.c.orig 2021-12-29 16:11:04.588615131 +0100 -+++ libass-0.15.2/libass/ass_fontselect.c 2021-12-29 16:13:00.276849748 +0100 -@@ -48,7 +48,6 @@ - #include "ass_string.h" - - #include <windows.h> --#include <tchar.h> - - #define ABS(x) ((x) < 0 ? -(x) : (x)) - #define MAX_FULLNAME 100 -@@ -201,7 +200,7 @@ - { - DIR *d = opendir(dir); - wchar_t *dirw = ToWide(dir); -- _TDIR *d = _topendir(dirw); -+ _WDIR *d = _wopendir(dirw); - free(dirw); - if (!d) - return; -@@ -209,7 +208,7 @@ - size_t namemax = 0; - char *namebuf = NULL; - while (1) { -- struct _tdirent *entry = _treaddir(d); -+ struct _wdirent *entry = _wreaddir(d); - if (!entry) - break; - char* d_name = FromWide(entry->d_name); -@@ -239,7 +238,7 @@ - free(d_name); - } - free(namebuf); -- _tclosedir(d); -+ _wclosedir(d); - } - - /** diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak index bb7478a91bc7c6fc66f2929b4910b387fb6ae79a..6472cb06baaaaa80a2da84370f99e38b2e5fe664 100644 --- a/contrib/src/ass/rules.mak +++ b/contrib/src/ass/rules.mak @@ -41,7 +41,6 @@ libass: libass-$(ASS_VERSION).tar.gz .sum-ass $(APPLY) $(SRC)/ass/0001-configure-add-Core-Text-and-DirectWrite-to-Libs.priv.patch ifdef HAVE_WIN32 $(APPLY) $(SRC)/ass/use-topendir.patch -# $(APPLY) $(SRC)/ass/libass-no-tchar.patch endif $(UPDATE_AUTOCONFIG) $(MOVE)