summaryrefslogtreecommitdiff
path: root/mysys/my_open.c
diff options
context:
space:
mode:
authorreggie@big_geek. <>2006-05-08 15:15:05 -0500
committerreggie@big_geek. <>2006-05-08 15:15:05 -0500
commite815c4c9747c8643a48950bcc854170845c47628 (patch)
tree45e25c571bea2101f73fff090266209606f600ae /mysys/my_open.c
parent792f7383ac7432a284b4a2dcacfeaa66988d71ec (diff)
parent11d66e806836a1bb57b4709ca2b171a0c9dc9bd6 (diff)
downloadmariadb-git-e815c4c9747c8643a48950bcc854170845c47628.tar.gz
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into big_geek.:C:/Work/mysql/mysql-5.1
Diffstat (limited to 'mysys/my_open.c')
-rw-r--r--mysys/my_open.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_open.c b/mysys/my_open.c
index ed323b3b1ad..6041ddde9fc 100644
--- a/mysys/my_open.c
+++ b/mysys/my_open.c
@@ -19,7 +19,7 @@
#include "mysys_err.h"
#include <my_dir.h>
#include <errno.h>
-#if defined(MSDOS) || defined(__WIN__)
+#if defined(__WIN__)
#include <share.h>
#endif
@@ -45,7 +45,7 @@ File my_open(const char *FileName, int Flags, myf MyFlags)
DBUG_ENTER("my_open");
DBUG_PRINT("my",("Name: '%s' Flags: %d MyFlags: %d",
FileName, Flags, MyFlags));
-#if defined(MSDOS) || defined(__WIN__)
+#if defined(__WIN__)
/*
Check that we don't try to open or create a file name that may
cause problems for us in the future (like PRN)