From 7557f6e3a32aca16a33aa72f50601ae8c1e9e8d6 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 27 Nov 2016 15:24:36 -0800 Subject: [PATCH] wimlib.h: define timespec for MSVC compatibility --- include/wimlib.h | 29 ++++++++++++++++++++++++++--- src/iterate_dir.c | 10 ++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/include/wimlib.h b/include/wimlib.h index 09bf1052..5941b9ee 100644 --- a/include/wimlib.h +++ b/include/wimlib.h @@ -408,6 +408,29 @@ extern "C" { #endif +/* + * To represent file timestamps, wimlib's API uses the POSIX 'struct timespec'. + * This was probably a mistake because it doesn't play well with Visual Studio. + * In old VS versions it isn't present at all; in newer VS versions it is + * supposedly present, but I wouldn't trust it to be the same size as the one + * MinGW uses. The solution is to define a compatible structure ourselves when + * this header is included on Windows and the compiler is not MinGW. + */ +#if defined(_WIN32) && !defined(__GNUC__) +typedef struct { + /* Seconds since start of UNIX epoch (January 1, 1970) */ +#ifdef _WIN64 + int64_t tv_sec; +#else + int32_t tv_sec; +#endif + /* Nanoseconds (0-999999999) */ + int32_t tv_nsec; +} wimlib_timespec; +#else +# define wimlib_timespec struct timespec /* standard definition */ +#endif + /** * Opaque structure that represents a WIM, possibly backed by an on-disk file. * See @ref sec_basic_wim_handling_concepts for more information. @@ -1559,13 +1582,13 @@ struct wimlib_dir_entry { uint64_t hard_link_group_id; /** Time this file was created. */ - struct timespec creation_time; + wimlib_timespec creation_time; /** Time this file was last written to. */ - struct timespec last_write_time; + wimlib_timespec last_write_time; /** Time this file was last accessed. */ - struct timespec last_access_time; + wimlib_timespec last_access_time; /** The UNIX user ID of this file. This is a wimlib extension. * diff --git a/src/iterate_dir.c b/src/iterate_dir.c index 55d2a2a7..e4eb87d7 100644 --- a/src/iterate_dir.c +++ b/src/iterate_dir.c @@ -121,9 +121,19 @@ init_wimlib_dentry(struct wimlib_dir_entry *wdentry, struct wim_dentry *dentry, wdentry->num_links = inode->i_nlink; wdentry->attributes = inode->i_attributes; wdentry->hard_link_group_id = inode->i_ino; + + /* For Windows builds, to maintain ABI compatibility with previous + * versions of the DLLs, double-check that we're using the expected size + * for 'struct timespec'. */ +#ifdef _WIN64 + STATIC_ASSERT(sizeof(struct timespec) == 16); +#elif defined(_WIN32) + STATIC_ASSERT(sizeof(struct timespec) == 8); +#endif wdentry->creation_time = wim_timestamp_to_timespec(inode->i_creation_time); wdentry->last_write_time = wim_timestamp_to_timespec(inode->i_last_write_time); wdentry->last_access_time = wim_timestamp_to_timespec(inode->i_last_access_time); + if (inode_get_unix_data(inode, &unix_data)) { wdentry->unix_uid = unix_data.uid; wdentry->unix_gid = unix_data.gid; -- 2.43.0