diff options
author | Jeremy Allison <jra@samba.org> | 2009-08-24 20:57:37 -0700 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2009-08-24 20:57:37 -0700 |
commit | c69f92d16d57c2387d31b5dfd01aab0685a671d0 (patch) | |
tree | 4eef7104df67108cde2fd436a28c51176473f5e5 /source3/include/proto.h | |
parent | 9a86f26a5f0b421f8cf259e579fe5946b39623f6 (diff) | |
download | samba-c69f92d16d57c2387d31b5dfd01aab0685a671d0.tar.gz samba-c69f92d16d57c2387d31b5dfd01aab0685a671d0.tar.bz2 samba-c69f92d16d57c2387d31b5dfd01aab0685a671d0.zip |
Second attempt at fix for bug 6529 - Offline files conflict with Vista and Office 2003.
Confirmation from reporter that this fixes the issue in master on ext3/ext4.
Back-ports to follow.
Jeremy.
Diffstat (limited to 'source3/include/proto.h')
-rw-r--r-- | source3/include/proto.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 97d05b3699..c530ee5b15 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1028,7 +1028,8 @@ char *current_timestring(TALLOC_CTX *ctx, bool hires); void srv_put_dos_date(char *buf,int offset,time_t unixdate); void srv_put_dos_date2(char *buf,int offset, time_t unixdate); void srv_put_dos_date3(char *buf,int offset,time_t unixdate); -void put_long_date_timespec(char *p, struct timespec ts); +void round_timespec(enum timestamp_set_resolution res, struct timespec *ts); +void put_long_date_timespec(enum timestamp_set_resolution res, char *p, struct timespec ts); void put_long_date(char *p, time_t t); void dos_filetime_timespec(struct timespec *tsp); time_t make_unix_date2(const void *date_ptr, int zone_offset); @@ -1044,7 +1045,7 @@ struct timespec timespec_current(void); struct timespec timespec_min(const struct timespec *ts1, const struct timespec *ts2); int timespec_compare(const struct timespec *ts1, const struct timespec *ts2); -void round_timespec(struct timespec *ts); +void round_timespec_to_sec(struct timespec *ts); void round_timespec_to_usec(struct timespec *ts); struct timespec interpret_long_date(const char *p); void cli_put_dos_date(struct cli_state *cli, char *buf, int offset, time_t unixdate); |