diff options
| author | monty@work.mysql.com <> | 2001-09-02 18:38:33 +0200 |
|---|---|---|
| committer | monty@work.mysql.com <> | 2001-09-02 18:38:33 +0200 |
| commit | 447c18954e904e5770d64ae3b0817a16b9060b74 (patch) | |
| tree | 4689ffbe50e97ce9a47deb58fa2b9e7decdfc6a8 /mysys/my_lib.c | |
| parent | 102cabfe4acd9c78fe321829bd168342b3fbd68a (diff) | |
| parent | 759cf54a9e70013d92fe18a84b3e4c56244de7da (diff) | |
| download | mariadb-git-447c18954e904e5770d64ae3b0817a16b9060b74.tar.gz | |
merge with 3.23.42
Diffstat (limited to 'mysys/my_lib.c')
| -rw-r--r-- | mysys/my_lib.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/mysys/my_lib.c b/mysys/my_lib.c index bb4474b9ce7..d183be58231 100644 --- a/mysys/my_lib.c +++ b/mysys/my_lib.c @@ -27,7 +27,9 @@ # include <dirent.h> # define NAMLEN(dirent) strlen((dirent)->d_name) #else +#ifndef OS2 # define dirent direct +#endif # define NAMLEN(dirent) (dirent)->d_namlen # if defined(HAVE_SYS_NDIR_H) # include <sys/ndir.h> @@ -50,6 +52,11 @@ #include <iodef.h> #include <descrip.h> #endif + +#ifdef OS2 +#include "my_os2dirsrch.h" +#endif + #if defined(THREAD) && defined(HAVE_READDIR_R) #define READDIR(A,B,C) ((errno=readdir_r(A,B,&C)) != 0 || !C) #else @@ -337,9 +344,7 @@ my_string directory_file_name (my_string dst, const char *src) ***************************************************************************** */ -MY_DIR *my_dir(path, MyFlags) -const char *path; -myf MyFlags; +MY_DIR *my_dir(const char *path, myf MyFlags) { struct fileinfo *fnames; char *buffer, *obuffer, *tempptr; @@ -475,9 +480,7 @@ error: ** At MSDOS you always get stat of files, but time is in packed MSDOS-format ******************************************************************************/ -MY_DIR *my_dir(path, MyFlags) -const char *path; -myf MyFlags; +MY_DIR *my_dir(const char* path, myf MyFlags) { struct fileinfo *fnames; char *buffer, *obuffer, *tempptr; |