diff options
| author | unknown <reggie@big_geek.> | 2006-05-08 15:15:05 -0500 |
|---|---|---|
| committer | unknown <reggie@big_geek.> | 2006-05-08 15:15:05 -0500 |
| commit | d5ec9909a629d08dd28371cb05bfc69a6dedc115 (patch) | |
| tree | 45e25c571bea2101f73fff090266209606f600ae /mysys/my_access.c | |
| parent | 8f50e871e8388beff0a873db49cc8967a0441c08 (diff) | |
| parent | 6d50eb0e98c8d509fc7bda1fcad5ada28a938c3d (diff) | |
| download | mariadb-git-d5ec9909a629d08dd28371cb05bfc69a6dedc115.tar.gz | |
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into big_geek.:C:/Work/mysql/mysql-5.1
include/config-win.h:
Auto merged
include/m_string.h:
Auto merged
include/my_base.h:
Auto merged
include/my_sys.h:
Auto merged
include/my_tree.h:
Auto merged
mysys/mf_keycache.c:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_open.c:
Auto merged
mysys/my_access.c:
adjusted defines from merge
Diffstat (limited to 'mysys/my_access.c')
| -rw-r--r-- | mysys/my_access.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_access.c b/mysys/my_access.c index 871de8de0b8..9255d716919 100644 --- a/mysys/my_access.c +++ b/mysys/my_access.c @@ -156,7 +156,7 @@ int check_if_legal_tablename(const char *name) } -#if defined(MSDOS) || defined(__WIN__) || defined(__EMX__) +#if defined(__WIN__) || defined(__EMX__) /* @@ -199,4 +199,4 @@ int check_if_legal_filename(const char *path) DBUG_RETURN(0); } -#endif /* defined(MSDOS) || defined(__WIN__) || defined(__EMX__) */ +#endif /* defined(__WIN__) || defined(__EMX__) */ |