mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 05:09:19 +08:00
a29126f785
* [tre] mingw support * [libmagic] Windows support * [libmagic] Apply @Neumann-A suggestions * [libmagic] Add host dependency Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [libmagic] Copy the magic file to the corresponding tools dir * [ci baseline] libmagic now passes * Update ports/libmagic/portfile.cmake * [libmagic] Import patch from MSYS2 * [vcpkg baseline] Update libmagic, tre Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
28 lines
818 B
Diff
28 lines
818 B
Diff
# From https://github.com/msys2/MINGW-packages/commit/3a51faadb8bacf06c7b7fd84b2ea80775d1a8b0d
|
|
|
|
# this is an advanced patch to fix building v5.38
|
|
# see for details
|
|
# this patch should be removed with the next version
|
|
diff --git a/src/compress.c b/src/compress.c
|
|
index 33ce2bc..f172eda 100644
|
|
--- a/src/compress.c
|
|
+++ b/src/compress.c
|
|
@@ -378,7 +378,7 @@
|
|
sread(int fd, void *buf, size_t n, int canbepipe __attribute__((__unused__)))
|
|
{
|
|
ssize_t rv;
|
|
-#ifdef FIONREAD
|
|
+#if defined(FIONREAD) && !defined(__MINGW32__) && !defined(WIN32)
|
|
int t = 0;
|
|
#endif
|
|
size_t rn = n;
|
|
@@ -386,7 +386,7 @@
|
|
if (fd == STDIN_FILENO)
|
|
goto nocheck;
|
|
|
|
-#ifdef FIONREAD
|
|
+#if defined(FIONREAD) && !defined(__MINGW32__) && !defined(WIN32)
|
|
if (canbepipe && (ioctl(fd, FIONREAD, &t) == -1 || t == 0)) {
|
|
#ifdef FD_ZERO
|
|
ssize_t cnt;
|