diff options
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 23 |
1 files changed, 20 insertions, 3 deletions
@@ -12,6 +12,9 @@ **********************************************************************/ +//#ifdef __CYGWIN__ +//#include <windows.h> +//#endif #ifdef _WIN32 #include "missing/file.h" #endif @@ -2178,7 +2181,7 @@ rb_file_s_rename(VALUE klass, VALUE from, VALUE to) dst = StringValueCStr(to); if (rename(src, dst) < 0) { #if defined __CYGWIN__ - extern unsigned long __attribute__((stdcall)) GetLastError(); + extern unsigned long __attribute__((stdcall)) GetLastError(void); errno = GetLastError(); /* This is a Cygwin bug */ #elif defined DOSISH && !defined _WIN32 if (errno == EEXIST @@ -3039,7 +3042,19 @@ rb_file_truncate(VALUE obj, VALUE len) # define LOCK_UN 8 # endif -#if 1 +#ifdef __CYGWIN__ +#include <winerror.h> +static int +cygwin_flock(int fd, int op) +{ + int ret = flock(fd, op); + if (GetLastError() == ERROR_NOT_LOCKED) + ret = 0; + return ret; +} +# define flock(fd, op) cygwin_flock(fd, op) +#endif + static int rb_thread_flock(int fd, int op, OpenFile *fptr) { @@ -3067,8 +3082,10 @@ rb_thread_flock(int fd, int op, OpenFile *fptr) } return 0; } -#define flock(fd, op) rb_thread_flock(fd, op, fptr) +#ifdef __CYGWIN__ +# undef flock #endif +#define flock(fd, op) rb_thread_flock(fd, op, fptr) /* * call-seq: |