Module: wine Branch: master Commit: 9df976766fa224cad63895d74c90646664121e7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9df976766fa224cad63895d74...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Oct 6 10:17:12 2021 +0200
libport: Remove the obsolete O_LARGEFILE define.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ntdll/unix/file.c | 2 +- include/wine/port.h | 5 ----- server/device.c | 3 +-- server/file.c | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 43e85b0c955..7e47e32bab9 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1172,7 +1172,7 @@ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) struct stat st; int fd, flags;
- if ((fd = open( dir, O_RDONLY | O_NONBLOCK | O_LARGEFILE )) == -1) + if ((fd = open( dir, O_RDONLY | O_NONBLOCK )) == -1) return TRUE;
if (ioctl( fd, EXT2_IOC_GETFLAGS, &flags ) != -1 && (flags & EXT4_CASEFOLD_FL)) diff --git a/include/wine/port.h b/include/wine/port.h index 3bb13275c32..6e05d73d05a 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -82,11 +82,6 @@ static inline const char *dlerror(void) { return "No dlopen support on Windows"; #define RTLD_GLOBAL 0x100 #endif
-/* So we open files in 64 bit access mode on Linux */ -#ifndef O_LARGEFILE -# define O_LARGEFILE 0 -#endif - /**************************************************************** * Constants */ diff --git a/server/device.c b/server/device.c index 5abe1e3bb00..f61f24ea4ea 100644 --- a/server/device.c +++ b/server/device.c @@ -440,8 +440,7 @@ static struct object *device_open_file( struct object *obj, unsigned int access, mode_t mode = 0666; access = file->obj.ops->map_access( &file->obj, access ); nt_name.str = device->obj.ops->get_full_name( &device->obj, &nt_name.len ); - file->fd = open_fd( NULL, device->unix_path, nt_name, O_NONBLOCK | O_LARGEFILE, - &mode, access, sharing, options ); + file->fd = open_fd( NULL, device->unix_path, nt_name, O_NONBLOCK, &mode, access, sharing, options ); if (file->fd) set_fd_user( file->fd, &device_file_fd_ops, &file->obj ); } else file->fd = alloc_pseudo_fd( &device_file_fd_ops, &file->obj, options ); diff --git a/server/file.c b/server/file.c index 2c7cb0ce5ca..08b0b59beb0 100644 --- a/server/file.c +++ b/server/file.c @@ -269,7 +269,7 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si access = map_access( access, &file_type.mapping );
/* FIXME: should set error to STATUS_OBJECT_NAME_COLLISION if file existed before */ - fd = open_fd( root, name, nt_name, flags | O_NONBLOCK | O_LARGEFILE, &mode, access, sharing, options ); + fd = open_fd( root, name, nt_name, flags | O_NONBLOCK, &mode, access, sharing, options ); if (!fd) goto done;
if (S_ISDIR(mode))