diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-09-30 22:10:22 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-09-30 22:10:22 +0200 |
| commit | 4acaca0202ccf1beb553a670121a25b15965be59 (patch) | |
| tree | 6e1d50710af632760b55f10ac9de00ba97a8394f /mysys/my_winfile.c | |
| parent | 14c2cfb568e081ef66e4b6aadfc9611dd0f4be88 (diff) | |
| download | mariadb-git-4acaca0202ccf1beb553a670121a25b15965be59.tar.gz | |
backport of
Revision:
2597.72.1 revid:sp1r-Reggie@core.-20080403153947-15243
removed instances of __NT__ from code. We now only build "NT" binaries
Diffstat (limited to 'mysys/my_winfile.c')
| -rw-r--r-- | mysys/my_winfile.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/mysys/my_winfile.c b/mysys/my_winfile.c index de1d747c967..6a2cda5ba29 100644 --- a/mysys/my_winfile.c +++ b/mysys/my_winfile.c @@ -314,10 +314,10 @@ size_t my_win_pread(File Filedes, uchar *Buffer, size_t Count, my_off_t offset) if(!ReadFile(hFile, Buffer, (DWORD)Count, &nBytesRead, &ov)) { DWORD lastError= GetLastError(); - /*
- ERROR_BROKEN_PIPE is returned when no more data coming
- through e.g. a command pipe in windows : see MSDN on ReadFile.
- */
+ /* + ERROR_BROKEN_PIPE is returned when no more data coming + through e.g. a command pipe in windows : see MSDN on ReadFile. + */ if(lastError == ERROR_HANDLE_EOF || lastError == ERROR_BROKEN_PIPE) DBUG_RETURN(0); /*return 0 at EOF*/ my_osmaperr(lastError); @@ -367,8 +367,8 @@ size_t my_win_pwrite(File Filedes, const uchar *Buffer, size_t Count, LARGE_INTEGER li; DBUG_ENTER("my_win_pwrite"); - DBUG_PRINT("my",("Filedes: %d, Buffer: %p, Count: %zd, offset: %llu", - Filedes, Buffer, Count, (ulonglong)offset)); + DBUG_PRINT("my",("Filedes: %d, Buffer: %p, Count: %llu, offset: %llu", + Filedes, Buffer, (ulonglong)Count, (ulonglong)offset)); if(!Count) DBUG_RETURN(0); @@ -425,7 +425,8 @@ size_t my_win_write(File fd, const uchar *Buffer, size_t Count) HANDLE hFile; DBUG_ENTER("my_win_write"); - DBUG_PRINT("my",("Filedes: %d, Buffer: %p, Count %zd", fd, Buffer, Count)); + DBUG_PRINT("my",("Filedes: %d, Buffer: %p, Count %llu", fd, Buffer, + (ulonglong)Count)); if(my_get_open_flags(fd) & _O_APPEND) { /* |