From 1598a4326ecb92d1baedd84d699e15dd5452d782 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 6 Sep 2014 05:17:21 +0200 Subject: [PATCH] Added missing file ... there should be some automatic check for that ;) --- ...linux-version-of-gcc-4.9.1-when-Werr.patch | 125 ++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 patches/Miscellaneous/0005-Appease-the-Archlinux-version-of-gcc-4.9.1-when-Werr.patch diff --git a/patches/Miscellaneous/0005-Appease-the-Archlinux-version-of-gcc-4.9.1-when-Werr.patch b/patches/Miscellaneous/0005-Appease-the-Archlinux-version-of-gcc-4.9.1-when-Werr.patch new file mode 100644 index 00000000..4be953df --- /dev/null +++ b/patches/Miscellaneous/0005-Appease-the-Archlinux-version-of-gcc-4.9.1-when-Werr.patch @@ -0,0 +1,125 @@ +From 068be01861e22ddd9360fbee4135937782ac77c8 Mon Sep 17 00:00:00 2001 +From: Sebastian Lackner +Date: Sat, 6 Sep 2014 04:59:20 +0200 +Subject: Appease the Archlinux version of gcc (4.9.1) when -Werror is enabled. + +--- + dlls/msvcp90/ios.c | 4 ++-- + dlls/msvcp90/locale.c | 6 +++--- + dlls/msvcp90/string.c | 12 ++++++------ + 3 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c +index fbba957..e099f27 100644 +--- a/dlls/msvcp90/ios.c ++++ b/dlls/msvcp90/ios.c +@@ -1215,7 +1215,7 @@ streamsize __thiscall basic_streambuf_char__Xsgetn_s(basic_streambuf_char *this, + chunk = count-copied; + + if(chunk > 0) { +- memcpy_s(ptr+copied, size, *this->prpos, chunk); ++ (void)memcpy_s(ptr+copied, size, *this->prpos, chunk); + *this->prpos += chunk; + *this->prsize -= chunk; + copied += chunk; +@@ -2083,7 +2083,7 @@ streamsize __thiscall basic_streambuf_wchar__Xsgetn_s(basic_streambuf_wchar *thi + chunk = count-copied; + + if(chunk > 0) { +- memcpy_s(ptr+copied, size, *this->prpos, chunk*sizeof(wchar_t)); ++ (void)memcpy_s(ptr+copied, size, *this->prpos, chunk*sizeof(wchar_t)); + *this->prpos += chunk; + *this->prsize -= chunk; + copied += chunk; +diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c +index b15f1b8..015511d 100644 +--- a/dlls/msvcp90/locale.c ++++ b/dlls/msvcp90/locale.c +@@ -1595,7 +1595,7 @@ const char* __thiscall ctype_char__Do_narrow_s(const ctype_char *this, const cha + const char *last, char unused, char *dest, MSVCP_size_t size) + { + TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); +- memcpy_s(dest, size, first, last-first); ++ (void)memcpy_s(dest, size, first, last-first); + return last; + } + +@@ -1674,7 +1674,7 @@ const char* __thiscall ctype_char__Do_widen_s(const ctype_char *this, + const char *first, const char *last, char *dest, MSVCP_size_t size) + { + TRACE("(%p %p %p %p %lu)\n", this, first, last, dest, size); +- memcpy_s(dest, size, first, last-first); ++ (void)memcpy_s(dest, size, first, last-first); + return last; + } + +@@ -3674,7 +3674,7 @@ int __thiscall codecvt_wchar_do_out(const codecvt_wchar *this, int *state, + } + + (*from_next)++; +- memcpy_s(*to_next, to_end-*to_next, buf, size); ++ (void)memcpy_s(*to_next, to_end-*to_next, buf, size); + (*to_next) += size; + } + } +diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c +index ce05613..c8dfce9 100644 +--- a/dlls/msvcp90/string.c ++++ b/dlls/msvcp90/string.c +@@ -82,7 +82,7 @@ MSVCP_size_t CDECL MSVCP_char_traits_char_length(const char *str) + char* CDECL MSVCP_char_traits_char__Copy_s(char *dest, + MSVCP_size_t size, const char *src, MSVCP_size_t count) + { +- memcpy_s(dest, size, src, count); ++ (void)memcpy_s(dest, size, src, count); + return dest; + } + +@@ -107,7 +107,7 @@ const char * CDECL MSVCP_char_traits_char_find( + char* CDECL MSVCP_char_traits_char__Move_s(char *dest, + MSVCP_size_t size, const char *src, MSVCP_size_t count) + { +- memmove_s(dest, size, src, count); ++ (void)memmove_s(dest, size, src, count); + return dest; + } + +@@ -206,7 +206,7 @@ MSVCP_size_t CDECL MSVCP_char_traits_wchar_length(const wchar_t *str) + wchar_t* CDECL MSVCP_char_traits_wchar__Copy_s(wchar_t *dest, + MSVCP_size_t size, const wchar_t *src, MSVCP_size_t count) + { +- memcpy_s(dest, size * sizeof(wchar_t), src, count * sizeof(wchar_t)); ++ (void)memcpy_s(dest, size * sizeof(wchar_t), src, count * sizeof(wchar_t)); + return dest; + } + +@@ -237,7 +237,7 @@ const wchar_t* CDECL MSVCP_char_traits_wchar_find( + wchar_t* CDECL MSVCP_char_traits_wchar__Move_s(wchar_t *dest, + MSVCP_size_t size, const wchar_t *src, MSVCP_size_t count) + { +- memmove_s(dest, size * sizeof(wchar_t), src, count * sizeof(wchar_t)); ++ (void)memmove_s(dest, size * sizeof(wchar_t), src, count * sizeof(wchar_t)); + return dest; + } + +@@ -353,7 +353,7 @@ MSVCP_size_t CDECL MSVCP_char_traits_short_length(const unsigned short *str) + unsigned short * CDECL MSVCP_char_traits_short__Copy_s(unsigned short *dest, + MSVCP_size_t size, const unsigned short *src, MSVCP_size_t count) + { +- memcpy_s(dest, size * sizeof(unsigned short), src, count * sizeof(unsigned short)); ++ (void)memcpy_s(dest, size * sizeof(unsigned short), src, count * sizeof(unsigned short)); + return dest; + } + +@@ -384,7 +384,7 @@ const unsigned short* CDECL MSVCP_char_traits_short_find( + unsigned short* CDECL MSVCP_char_traits_short__Move_s(unsigned short *dest, + MSVCP_size_t size, const unsigned short *src, MSVCP_size_t count) + { +- memmove_s(dest, size * sizeof(unsigned short), src, count * sizeof(unsigned short)); ++ (void)memmove_s(dest, size * sizeof(unsigned short), src, count * sizeof(unsigned short)); + return dest; + } + +-- +2.1.0 +