Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
13
Issues
13
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GSoC2018
macOS
vlc
Commits
82faba6e
Commit
82faba6e
authored
Dec 03, 2018
by
Hugo Beauzée-Luyssen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contrib: libdsm: Don't use _pipe on winstore
parent
ac3e3e72
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
0 deletions
+38
-0
contrib/src/libdsm/0001-compat-Don-t-use-_pipe-when-building-for-winstore.patch
...1-compat-Don-t-use-_pipe-when-building-for-winstore.patch
+37
-0
contrib/src/libdsm/rules.mak
contrib/src/libdsm/rules.mak
+1
-0
No files found.
contrib/src/libdsm/0001-compat-Don-t-use-_pipe-when-building-for-winstore.patch
0 → 100644
View file @
82faba6e
From 45e48b777207853d7b125612b40b5d8fde101634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Mon, 3 Dec 2018 14:13:26 +0100
Subject: [PATCH] compat: Don't use _pipe when building for winstore
---
compat/compat.h | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/compat/compat.h b/compat/compat.h
index 4eef355..b7f878c 100644
--- a/compat/compat.h
+++ b/compat/compat.h
@@ -66,13 +66,18 @@
char *strndup(const char *str, size_t n);
#endif
#if !defined(HAVE_PIPE) && defined(HAVE__PIPE)
-#include <fcntl.h>
-#define HAVE_PIPE
+# ifdef _WIN32
+# include <winapifamily.h>
+# endif
+# if !defined(_WIN32) || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+# include <fcntl.h>
+# define HAVE_PIPE
static inline int pipe(int fds[2])
{
return _pipe(fds, 32768, O_NOINHERIT | O_BINARY);
}
#endif
+#endif
#ifndef _WIN32
#define closesocket(fd) close(fd)
--
2.19.2
contrib/src/libdsm/rules.mak
View file @
82faba6e
...
@@ -23,6 +23,7 @@ libdsm: libdsm-$(LIBDSM_VERSION).tar.gz .sum-libdsm
...
@@ -23,6 +23,7 @@ libdsm: libdsm-$(LIBDSM_VERSION).tar.gz .sum-libdsm
$(APPLY)
$(SRC)
/libdsm/0001-build-fix-nl_langinfo-detection-on-Android.patch
$(APPLY)
$(SRC)
/libdsm/0001-build-fix-nl_langinfo-detection-on-Android.patch
$(APPLY)
$(SRC)
/libdsm/fix-pc-generation.patch
$(APPLY)
$(SRC)
/libdsm/fix-pc-generation.patch
$(APPLY)
$(SRC)
/libdsm/fix-pipe-compat.patch
$(APPLY)
$(SRC)
/libdsm/fix-pipe-compat.patch
$(APPLY)
$(SRC)
/libdsm/0001-compat-Don-t-use-_pipe-when-building-for-winstore.patch
$(MOVE)
$(MOVE)
DEPS_libdsm
=
libtasn1 iconv
DEPS_libdsm
=
libtasn1 iconv
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment