diff options
Diffstat (limited to 'mysys/my_getwd.c')
| -rw-r--r-- | mysys/my_getwd.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/mysys/my_getwd.c b/mysys/my_getwd.c index 5663ceaa60e..765c30bc281 100644 --- a/mysys/my_getwd.c +++ b/mysys/my_getwd.c @@ -27,14 +27,6 @@ #include <dos.h> #include <direct.h> #endif -#if defined(OS2) -#include <direct.h> -#endif - -#ifdef __EMX__ -/* chdir2 support also drive change */ -#define chdir _chdir2 -#endif /* Gets current working directory in buff. Directory is allways ended with FN_LIBCHAR */ @@ -95,14 +87,14 @@ int my_setwd(const char *dir, myf MyFlags) int res; size_s length; my_string start,pos; -#if defined(VMS) || defined(MSDOS) || defined(OS2) +#if defined(VMS) || defined(MSDOS) char buff[FN_REFLEN]; #endif DBUG_ENTER("my_setwd"); DBUG_PRINT("my",("dir: '%s' MyFlags %d", dir, MyFlags)); start=(my_string) dir; -#if defined(MSDOS) || defined(OS2) /* OS2/MSDOS chdir can't change drive */ +#if defined(MSDOS) /* MSDOS chdir can't change drive */ #if !defined(_DDL) && !defined(WIN32) if ((pos=(char*) strchr(dir,FN_DEVCHAR)) != 0) { @@ -113,13 +105,8 @@ int my_setwd(const char *dir, myf MyFlags) drives= (uint) -1; if ((pos-(byte*) dir) == 2 && drive > 0 && drive < 32) { -#ifdef OS2 - _chdrive(drive); - drives = _getdrive(); -#else _dos_setdrive(drive,&drives); _dos_getdrive(&drives); -#endif } if (drive != drives) { |