diff options
| author | Zak Greant <zak@php.net> | 2002-06-07 15:07:55 +0000 |
|---|---|---|
| committer | Zak Greant <zak@php.net> | 2002-06-07 15:07:55 +0000 |
| commit | 9daec6d2278fb671f486100faecbbbc5a42cb863 (patch) | |
| tree | 671ce507dddd5a6f28d3fc9facba1d11fa3e6426 /ext/mysql/libmysql/my_lib.c | |
| parent | fcd6d2b5cda9fc9ef582771b750c93ba09494828 (diff) | |
| download | php-git-9daec6d2278fb671f486100faecbbbc5a42cb863.tar.gz | |
Updating embedded libmysql to version 3.23.48
Diffstat (limited to 'ext/mysql/libmysql/my_lib.c')
| -rw-r--r-- | ext/mysql/libmysql/my_lib.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ext/mysql/libmysql/my_lib.c b/ext/mysql/libmysql/my_lib.c index 764309d120..259a7222b4 100644 --- a/ext/mysql/libmysql/my_lib.c +++ b/ext/mysql/libmysql/my_lib.c @@ -13,7 +13,9 @@ This file is public domain and comes with NO WARRANTY of any kind */ # 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> @@ -36,6 +38,11 @@ This file is public domain and comes with NO WARRANTY of any kind */ #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 @@ -323,9 +330,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; @@ -461,9 +466,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; |