Changeset: 69e114bda706 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=69e114bda706 Modified Files: Branch: Apr2011 Log Message:
merges diffs (53 lines): diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -643,7 +643,10 @@ /* modifiable single-machine data */ #define LOCALSTATEDIR PREFIX "\\var" -#define lstat stat +#include <sys/stat.h> +#define lstat _stat64 +#define stat _stat64 +#define fstat _fstat64 #ifndef S_ISREG /* swig-generated source file doesn't include us first */ #define S_ISREG(mode) (((mode) & _S_IFMT) == _S_IFREG) #endif diff --git a/gdk/ChangeLog.Apr2011 b/gdk/ChangeLog.Apr2011 --- a/gdk/ChangeLog.Apr2011 +++ b/gdk/ChangeLog.Apr2011 @@ -1,3 +1,7 @@ # ChangeLog file for MonetDB # This file is updated with Maddlog +* Fri May 13 2011 Sjoerd Mullender <[email protected]> +- Fixed a bug where large files (> 2GB) didn't always get deleted on + Windows. + diff --git a/gdk/gdk_posix.mx b/gdk/gdk_posix.mx --- a/gdk/gdk_posix.mx +++ b/gdk/gdk_posix.mx @@ -272,7 +272,7 @@ gdk_export int win_unlink(const char *); gdk_export int win_mkdir(const char *, const int mode); -#define stat(x,y) win_stat(x,y) +#define _stat64(x,y) win_stat(x,y) #define mkdir win_mkdir #define rmdir win_rmdir #define rename win_rename @@ -1681,11 +1681,12 @@ return buf; } +#undef _stat64 int -win_stat(const char *pathname, struct stat *st) +win_stat(const char *pathname, struct _stat64 *st) { char buf[128], *p = reduce_dir_name(pathname, buf, sizeof(buf)); - int ret = stat(p, st); + int ret = _stat64(p, st); if (p != buf) free(p); _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
