diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-28 12:18:48 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-28 12:18:48 +0000 |
| commit | fc16d956cb1a06bf901138af35f9adaf5cd44ca8 (patch) | |
| tree | cd0396855e1570e2e065f8d339c67398fb0aea16 | |
| parent | 7f005938cff3989e1f35981b8ab0619faf770920 (diff) | |
* configure.in (ac_cv_func_fcntl): fcntl support for MinGW.
* missing/flock.c: workaround for MinGW.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | missing/flock.c | 5 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Wed Feb 28 21:15:00 2007 WATANABE Hirofumi <eban@ruby-lang.org> + + * configure.in (ac_cv_func_fcntl): fcntl support for MinGW. + + * missing/flock.c: workaround for MinGW. + Wed Feb 28 20:51:32 2007 URABE Shyouhei <shyouhei@ruby-lang.org> * pack.c (pack_unpack): properly ignore non-base64 octets such as diff --git a/missing/flock.c b/missing/flock.c index 7a5a58aaa7..2219d176d1 100644 --- a/missing/flock.c +++ b/missing/flock.c @@ -1,6 +1,7 @@ #include "config.h" -#if defined HAVE_FCNTL && defined HAVE_FCNTL_H +#if defined _WIN32 +#elif defined HAVE_FCNTL && defined HAVE_FCNTL_H /* These are the flock() constants. Since this sytems doesn't have flock(), the values of the constants are probably not available. @@ -118,7 +119,7 @@ flock(int fd, int operation) return -1; } } -#elif !defined _WIN32 +#else int flock(int fd, int operation) { |