summaryrefslogtreecommitdiff
path: root/missing
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-28 13:23:42 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-28 13:23:42 +0000
commitbc6ef3dc20acd005554c0666111c09dc72ef6eb4 (patch)
tree92cf3f9b3a59e052b3891535e142f83cbef34784 /missing
parenta53832da71fc48437e83434478ee08554663ff14 (diff)
Merge changes between r11913 and r11943 from ruby_1_8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@11944 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'missing')
-rw-r--r--missing/flock.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/missing/flock.c b/missing/flock.c
index ed619f0..5f6b41c 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.
@@ -122,7 +123,7 @@ flock(fd, operation)
return -1;
}
}
-#elif !defined _WIN32
+#else
int
flock(fd, operation)
int fd;