Rebase against 0652a2ccc967c6d1ca04c67f58112ff491ab9a62

This commit is contained in:
Alistair Leslie-Hughes
2019-04-11 08:48:06 +10:00
parent a8556b9c25
commit 72a13348de
10 changed files with 8 additions and 806 deletions

View File

@@ -1,4 +1,4 @@
From fbf186429a62b1bd076322ce394cc6a6322ca825 Mon Sep 17 00:00:00 2001
From da5af62afac8508b3323098bb004b87ffde77701 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Tue, 19 Aug 2014 22:10:49 -0600
Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
@@ -14,11 +14,11 @@ Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
create mode 100644 libs/port/xattr.c
diff --git a/configure.ac b/configure.ac
index 55d3dd0..552a94d 100644
index c80d9b1..745bf2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,6 +84,7 @@ AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug an
AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)]))
AC_ARG_WITH(v4l2, AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)]))
AC_ARG_WITH(vkd3d, AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)]))
AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan]))
+AC_ARG_WITH(xattr, AS_HELP_STRING([--without-xattr],[do not use xattr (security attributes support)]))
@@ -44,7 +44,7 @@ index 55d3dd0..552a94d 100644
AC_SUBST(DLLFLAGS,"-D_REENTRANT")
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index d0aaadf..27d2ce0 100644
index 4960e91..5957c44 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -122,6 +122,22 @@ mode_t FILE_umask = 0;
@@ -108,10 +108,10 @@ index 2f6e9eb..b21d045 100644
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index ef3b23f..1c09fb5 100644
index a2e96d1..b975418 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -106,4 +106,6 @@ C_SRCS = \
@@ -108,4 +108,6 @@ C_SRCS = \
usleep.c \
utf8.c \
wctomb.c \