Cleanup whitespace noise

This commit is contained in:
Alistair Leslie-Hughes
2020-01-20 20:17:31 +11:00
parent 506efa392c
commit dd581d0b2f
6 changed files with 262 additions and 269 deletions

View File

@@ -1,4 +1,4 @@
From 78f4401a1e5d50097be8dd8458273ef1d4a548a7 Mon Sep 17 00:00:00 2001
From 77a43be1f24d8fbbdb500b6ee89b20673f9704e7 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
@@ -8,16 +8,16 @@ Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
configure.ac | 12 ++++++++++++
dlls/ntdll/file.c | 16 ++++++++++++++++
include/wine/port.h | 8 ++++++++
libs/port/Makefile.in | 4 +++-
libs/port/Makefile.in | 3 ++-
libs/port/xattr.c | 39 +++++++++++++++++++++++++++++++++++++++
5 files changed, 78 insertions(+), 1 deletion(-)
5 files changed, 77 insertions(+), 1 deletion(-)
create mode 100644 libs/port/xattr.c
diff --git a/configure.ac b/configure.ac
index 9385d20..60d43d3 100644
index f6d520c59ef..19dadd2063c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,7 @@ AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug an
@@ -86,6 +86,7 @@ AC_ARG_WITH(unwind, AS_HELP_STRING([--without-unwind],[do not use the libunwi
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]))
@@ -25,7 +25,7 @@ index 9385d20..60d43d3 100644
AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
AC_ARG_WITH(xcursor, AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]),
@@ -711,6 +712,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
@@ -704,6 +705,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
#include <sys/socket.h>
#endif])
@@ -44,7 +44,7 @@ index 9385d20..60d43d3 100644
AC_SUBST(DLLFLAGS,"-D_REENTRANT")
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index b70477e..2c99c1d 100644
index 8aaf7b982ba..ae8fd77bea8 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -127,6 +127,22 @@ static const WCHAR ntfsW[] = {'N','T','F','S'};
@@ -71,10 +71,10 @@ index b70477e..2c99c1d 100644
static inline ULONG get_file_attributes( const struct stat *st )
{
diff --git a/include/wine/port.h b/include/wine/port.h
index 19c8682..eaa23bc 100644
index 92a3a362ddb..8fec3a34591 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -344,6 +344,14 @@ int usleep (unsigned int useconds);
@@ -356,6 +356,14 @@ int usleep (unsigned int useconds);
extern int mkstemps(char *template, int suffix_len);
@@ -90,20 +90,19 @@ index 19c8682..eaa23bc 100644
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index db27249..790fd96 100644
index b050686ba0f..447c1939078 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -109,4 +109,6 @@ C_SRCS = \
@@ -110,4 +110,5 @@ C_SRCS = \
usleep.c \
utf8.c \
wctomb.c \
- wctype.c
+ wctype.c \
+ xattr.c
+
diff --git a/libs/port/xattr.c b/libs/port/xattr.c
new file mode 100644
index 0000000..94b7713
index 00000000000..94b77132bbf
--- /dev/null
+++ b/libs/port/xattr.c
@@ -0,0 +1,39 @@
@@ -147,5 +146,5 @@ index 0000000..94b7713
+#endif
+}
--
1.9.1
2.24.1