Skip to content

W
wine-winehq
Commit 1013d2e7 authored by André Hentschel's avatar André Hentschel Committed by Alexandre Julliard
Browse files
Options

ntdll: Enhance FreeBSD checks to also check for DragonFly BSD when appropriate.

parent 1f6d078e
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
dlls/ntdll/directory.c
View file @ 1013d2e7
...@@ -486,7 +486,7 @@ static char *parse_mount_entries( FILE *f, dev_t dev, ino_t ino ) ...@@ -486,7 +486,7 @@ static char *parse_mount_entries( FILE *f, dev_t dev, ino_t ino )
} }
#endif #endif
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
#include <fstab.h> #include <fstab.h>
static char *parse_mount_entries( FILE *f, dev_t dev, ino_t ino ) 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 ) ...@@ -587,7 +587,7 @@ static char *get_default_drive_device( const char *root )
} }
RtlLeaveCriticalSection( &dir_section ); RtlLeaveCriticalSection( &dir_section );
#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__ ) #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__ ) || defined(__DragonFly__)
char *device = NULL; char *device = NULL;
int fd, res = -1; int fd, res = -1;
struct stat st; struct stat st;
......
dlls/ntdll/file.c
View file @ 1013d2e7
...@@ -2267,7 +2267,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC ...@@ -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 */ /* 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, static inline void get_device_info_fstatfs( FILE_FS_DEVICE_INFORMATION *info, const char *fstypename,
unsigned int flags ) unsigned int flags )
...@@ -2388,7 +2388,7 @@ static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) ...@@ -2388,7 +2388,7 @@ static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info )
info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM; info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
break; 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; struct statfs stfs;
if (fstatfs( fd, &stfs ) < 0) if (fstatfs( fd, &stfs ) < 0)
......
dlls/ntdll/nt.c
View file @ 1013d2e7
...@@ -1159,7 +1159,7 @@ void fill_cpu_info(void) ...@@ -1159,7 +1159,7 @@ void fill_cpu_info(void)
fclose(f); fclose(f);
} }
} }
#elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) #elif defined(__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__)
{ {
int ret, num; int ret, num;
size_t len; size_t len;
......
dlls/ntdll/signal_i386.c
View file @ 1013d2e7
...@@ -420,7 +420,7 @@ extern void DECLSPEC_NORETURN __wine_restore_regs( const CONTEXT *context ); ...@@ -420,7 +420,7 @@ extern void DECLSPEC_NORETURN __wine_restore_regs( const CONTEXT *context );
enum i386_trap_code enum i386_trap_code
{ {
TRAP_x86_UNKNOWN = -1, /* Unknown fault (TRAP_sig not defined) */ 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_DIVIDE = T_DIVIDE, /* Division by zero exception */
TRAP_x86_TRCTRAP = T_TRCTRAP, /* Single-step exception */ TRAP_x86_TRCTRAP = T_TRCTRAP, /* Single-step exception */
TRAP_x86_NMI = T_NMI, /* NMI interrupt */ TRAP_x86_NMI = T_NMI, /* NMI interrupt */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment