=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: ntdll: Enhance FreeBSD checks to also check for DragonFly BSD when appropriate.
Alexandre Julliard
julliard at winehq.org
Mon Jun 4 13:27:12 CDT 2012
Module: wine
Branch: master
Commit: 1013d2e75c33d1c990e01d3fc9b03a3c1c6578e9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1013d2e75c33d1c990e01d3fc9b03a3c1c6578e9
Author: André Hentschel <nerv at dawncrow.de>
Date: Sat Jun 2 18:53:57 2012 +0200
ntdll: Enhance FreeBSD checks to also check for DragonFly BSD when appropriate.
---
dlls/ntdll/directory.c | 4 ++--
dlls/ntdll/file.c | 4 ++--
dlls/ntdll/nt.c | 2 +-
dlls/ntdll/signal_i386.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
index 65c8b8f..a048e1d 100644
--- a/dlls/ntdll/directory.c
+++ b/dlls/ntdll/directory.c
@@ -486,7 +486,7 @@ static char *parse_mount_entries( FILE *f, dev_t dev, ino_t ino )
}
#endif
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
#include <fstab.h>
static char *parse_mount_entries( FILE *f, dev_t dev, ino_t ino )
{
@@ -587,7 +587,7 @@ static char *get_default_drive_device( const char *root )
}
RtlLeaveCriticalSection( &dir_section );
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__ )
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__ ) || defined(__DragonFly__)
char *device = NULL;
int fd, res = -1;
struct stat st;
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 8e48602..e54b42a 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -2267,7 +2267,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC
}
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
/* helper for FILE_GetDeviceInfo to hide some platform differences in fstatfs */
static inline void get_device_info_fstatfs( FILE_FS_DEVICE_INFORMATION *info, const char *fstypename,
unsigned int flags )
@@ -2388,7 +2388,7 @@ static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info )
info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
break;
}
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__APPLE__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
struct statfs stfs;
if (fstatfs( fd, &stfs ) < 0)
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index 3ed8038..b90672b 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -1159,7 +1159,7 @@ void fill_cpu_info(void)
fclose(f);
}
}
-#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__)
+#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__)
{
int ret, num;
size_t len;
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index 3b07e77..4a83a70 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -420,7 +420,7 @@ extern void DECLSPEC_NORETURN __wine_restore_regs( const CONTEXT *context );
enum i386_trap_code
{
TRAP_x86_UNKNOWN = -1, /* Unknown fault (TRAP_sig not defined) */
-#if defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
TRAP_x86_DIVIDE = T_DIVIDE, /* Division by zero exception */
TRAP_x86_TRCTRAP = T_TRCTRAP, /* Single-step exception */
TRAP_x86_NMI = T_NMI, /* NMI interrupt */
More information about the wine-cvs
mailing list