diff options
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 48 | ||||
| -rw-r--r-- | source3/include/proto.h | 7 |
2 files changed, 4 insertions, 51 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 562b64ca9a..e321e4c943 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -259,15 +259,11 @@ typedef sig_atomic_t volatile SIG_ATOMIC_T; */ #ifndef SMB_DEV_T -# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_DEV64_T) -# define SMB_DEV_T dev64_t -# else -# define SMB_DEV_T dev_t -# endif +# define SMB_DEV_T dev_t #endif #ifndef LARGE_SMB_DEV_T -# if (defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_DEV64_T)) || (defined(SIZEOF_DEV_T) && (SIZEOF_DEV_T == 8)) +# if (defined(SIZEOF_DEV_T) && (SIZEOF_DEV_T == 8)) # define LARGE_SMB_DEV_T 1 # endif #endif @@ -285,15 +281,11 @@ typedef sig_atomic_t volatile SIG_ATOMIC_T; */ #ifndef SMB_INO_T -# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_INO64_T) -# define SMB_INO_T ino64_t -# else # define SMB_INO_T ino_t -# endif #endif #ifndef LARGE_SMB_INO_T -# if (defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_INO64_T)) || (defined(SIZEOF_INO_T) && (SIZEOF_INO_T == 8)) +# if (defined(SIZEOF_INO_T) && (SIZEOF_INO_T == 8)) # define LARGE_SMB_INO_T 1 # endif #endif @@ -307,11 +299,7 @@ typedef sig_atomic_t volatile SIG_ATOMIC_T; #endif #ifndef SMB_OFF_T -# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_OFF64_T) -# define SMB_OFF_T off64_t -# else # define SMB_OFF_T off_t -# endif #endif /* TODO: remove this macros */ @@ -330,7 +318,7 @@ typedef uint64_t br_off; */ #ifndef LARGE_SMB_OFF_T -# if (defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_OFF64_T)) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)) +# if (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)) # define LARGE_SMB_OFF_T 1 # endif #endif @@ -396,11 +384,7 @@ typedef struct stat_ex SMB_STRUCT_STAT; */ #ifndef SMB_STRUCT_DIRENT -# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_DIRENT64) -# define SMB_STRUCT_DIRENT struct dirent64 -# else # define SMB_STRUCT_DIRENT struct dirent -# endif #endif /* @@ -408,11 +392,7 @@ typedef struct stat_ex SMB_STRUCT_STAT; */ #ifndef SMB_STRUCT_DIR -# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_DIR64) -# define SMB_STRUCT_DIR DIR64 -# else # define SMB_STRUCT_DIR DIR -# endif #endif /* @@ -420,35 +400,19 @@ typedef struct stat_ex SMB_STRUCT_STAT; */ #ifndef SMB_STRUCT_FLOCK -# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T) -# define SMB_STRUCT_FLOCK struct flock64 -# else # define SMB_STRUCT_FLOCK struct flock -# endif #endif #ifndef SMB_F_SETLKW -# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T) -# define SMB_F_SETLKW F_SETLKW64 -# else # define SMB_F_SETLKW F_SETLKW -# endif #endif #ifndef SMB_F_SETLK -# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T) -# define SMB_F_SETLK F_SETLK64 -# else # define SMB_F_SETLK F_SETLK -# endif #endif #ifndef SMB_F_GETLK -# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_STRUCT_FLOCK64) && defined(HAVE_OFF64_T) -# define SMB_F_GETLK F_GETLK64 -# else # define SMB_F_GETLK F_GETLK -# endif #endif /* @@ -457,11 +421,7 @@ typedef struct stat_ex SMB_STRUCT_STAT; #ifndef SMB_STRUCT_AIOCB # if defined(WITH_AIO) -# if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_AIOCB64) -# define SMB_STRUCT_AIOCB struct aiocb64 -# else # define SMB_STRUCT_AIOCB struct aiocb -# endif # else # define SMB_STRUCT_AIOCB int /* AIO not being used but we still need the define.... */ # endif diff --git a/source3/include/proto.h b/source3/include/proto.h index e08c175eb6..0af512a7e4 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -394,17 +394,10 @@ int sys_aio_error(const SMB_STRUCT_AIOCB *aiocb); int sys_aio_fsync(int op, SMB_STRUCT_AIOCB *aiocb); int sys_aio_suspend(const SMB_STRUCT_AIOCB * const cblist[], int n, const struct timespec *timeout); -#if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_OFF64_T) && defined(HAVE_STAT64) -struct stat64; -void init_stat_ex_from_stat (struct stat_ex *dst, - const struct stat64 *src, - bool fake_dir_create_times); -#else struct stat; void init_stat_ex_from_stat (struct stat_ex *dst, const struct stat *src, bool fake_dir_create_times); -#endif /* The following definitions come from lib/system_smbd.c */ |