diff options
| author | anna@hasky.mysql.fi <> | 2006-06-02 22:31:51 +0300 |
|---|---|---|
| committer | anna@hasky.mysql.fi <> | 2006-06-02 22:31:51 +0300 |
| commit | 16a31b390bd048f0e046cf06cb253f0c6079d915 (patch) | |
| tree | 5559454081305d161db89d28c1ecf96622161483 /include | |
| parent | 3043d29b1f7da7fa19f59cd0d9a3d7e8f2b69777 (diff) | |
| parent | 5459ebc572a24e467856562338e6c82157dec845 (diff) | |
| download | mariadb-git-16a31b390bd048f0e046cf06cb253f0c6079d915.tar.gz | |
Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0
into hasky.mysql.fi:/home/anjuta/my/mysql-5.0-clean
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 1 | ||||
| -rw-r--r-- | include/my_global.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/config-win.h b/include/config-win.h index 8d937ffed22..75133ddc837 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -384,6 +384,7 @@ inline double ulonglong2double(ulonglong value) #define FN_LIBCHAR '\\' #define FN_ROOTDIR "\\" +#define FN_DEVCHAR ':' #define FN_NETWORK_DRIVES /* Uses \\ to indicate network drives */ #define FN_NO_CASE_SENCE /* Files are not case-sensitive */ #define OS_FILE_LIMIT 2048 diff --git a/include/my_global.h b/include/my_global.h index 7adf4845984..e7205c94c18 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -599,7 +599,6 @@ typedef SOCKET_SIZE_TYPE size_socket; #define FN_HOMELIB '~' /* ~/ is used as abbrev for home dir */ #define FN_CURLIB '.' /* ./ is used as abbrev for current dir */ #define FN_PARENTDIR ".." /* Parent directory; Must be a string */ -#define FN_DEVCHAR ':' #ifndef FN_LIBCHAR #ifdef __EMX__ |