diff options
| author | unknown <reggie@mdk10.(none)> | 2005-05-20 16:34:59 -0500 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-05-20 16:34:59 -0500 |
| commit | c7b3b3f02b7fb0c254f333aafbf5a5fdab08a0a0 (patch) | |
| tree | 1467155c10e8996d9cce3ec39db813852687c942 /include | |
| parent | 348ae81b069204330d47f9aab46d60e07360e08c (diff) | |
| parent | d7a4a8b63468637d1907bb5ec1fdb558c5b6d913 (diff) | |
| download | mariadb-git-c7b3b3f02b7fb0c254f333aafbf5a5fdab08a0a0.tar.gz | |
fixed conflicts
VC++Files/mysys/mysys.dsp:
Auto merged
include/my_sys.h:
Auto merged
sql/sql_db.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 473251f26cb..10358470c77 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -600,6 +600,11 @@ extern char *_my_strdup_with_length(const byte *from, uint length, const char *sFile, uint uLine, myf MyFlag); +#ifdef __WIN__ +extern int my_access(const char *path, int amode); +#else +#define my_access access +#endif #ifndef TERMINATE extern void TERMINATE(FILE *file); |