diff options
| author | unknown <wax@mysql.com> | 2003-08-10 05:38:08 +0600 |
|---|---|---|
| committer | unknown <wax@mysql.com> | 2003-08-10 05:38:08 +0600 |
| commit | 889618e7d4b4fb6183cd0218c0352092480f0c71 (patch) | |
| tree | 0bac3b638f8bb5b053b6b3bd6da99b7a9ef71d52 | |
| parent | ff5372592d02c96046092a071d4abce0b9b0b62b (diff) | |
| download | mariadb-git-889618e7d4b4fb6183cd0218c0352092480f0c71.tar.gz | |
BUG
replace HAVE_SETFILEPOINTER with __WIN__
include/config-win.h:
remove HAVE_SETFILEPOINTER
mysys/my_chsize.c:
replace HAVE_SETFILEPOINTER with __WIN__
move __WIN__ section to up
| -rw-r--r-- | include/config-win.h | 1 | ||||
| -rw-r--r-- | mysys/my_chsize.c | 36 |
2 files changed, 18 insertions, 19 deletions
diff --git a/include/config-win.h b/include/config-win.h index cde77a6e0aa..69020636893 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -276,7 +276,6 @@ inline double ulonglong2double(ulonglong value) #define HAVE_ISAM /* We want to have support for ISAM in 4.0 */ #define HAVE_QUERY_CACHE #define SPRINTF_RETURNS_INT -#define HAVE_SETFILEPOINTER /* SetFilePointer function for huge files */ #ifdef NOT_USED #define HAVE_SNPRINTF /* Gave link error */ diff --git a/mysys/my_chsize.c b/mysys/my_chsize.c index 0840a7a69e4..5708ac5b253 100644 --- a/mysys/my_chsize.c +++ b/mysys/my_chsize.c @@ -49,24 +49,7 @@ int my_chsize(File fd, my_off_t newlength, int filler, myf MyFlags) oldsize = my_seek(fd, 0L, MY_SEEK_END, MYF(MY_WME+MY_FAE)); DBUG_PRINT("info",("old_size: %ld", (ulong) oldsize)); -#ifdef HAVE_CHSIZE - if (oldsize > newlength || filler == 0) - { - if (chsize(fd,(off_t) newlength)) - { - DBUG_PRINT("error",("errno: %d",errno)); - my_errno=errno; - if (MyFlags & MY_WME) - my_error(EE_CANT_CHSIZE,MYF(ME_BELL+ME_WAITTANG),errno); - DBUG_RETURN(1); - } - else - { - if (filler == 0) - DBUG_RETURN(0); - } - } -#elif defined(HAVE_SETFILEPOINTER) +#ifdef __WIN__ if (oldsize > newlength) { LARGE_INTEGER new_length; @@ -84,6 +67,23 @@ int my_chsize(File fd, my_off_t newlength, int filler, myf MyFlags) my_error(EE_CANT_CHSIZE,MYF(ME_BELL+ME_WAITTANG),errno); DBUG_RETURN(1); } +#elif define(HAVE_CHSIZE) + if (oldsize > newlength || filler == 0) + { + if (chsize(fd,(off_t) newlength)) + { + DBUG_PRINT("error",("errno: %d",errno)); + my_errno=errno; + if (MyFlags & MY_WME) + my_error(EE_CANT_CHSIZE,MYF(ME_BELL+ME_WAITTANG),errno); + DBUG_RETURN(1); + } + else + { + if (filler == 0) + DBUG_RETURN(0); + } + } #elif defined(HAVE_FTRUNCATE) if (oldsize > newlength) { |