diff options
| author | unknown <brian@zim.(none)> | 2006-04-15 08:50:56 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-04-15 08:50:56 -0700 |
| commit | f42b90fcb8d4625336fabc13e899b7510bebec80 (patch) | |
| tree | fb7135a9b849ee5cc43a6f501aa24b0761206f84 /mysys/my_lib.c | |
| parent | 288fdada035180bd5f6b698f639d8b312568bfd2 (diff) | |
| parent | 06e8697d04ea7ecc28aed3ae7d68a3156546004c (diff) | |
| download | mariadb-git-f42b90fcb8d4625336fabc13e899b7510bebec80.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into zim.(none):/home/brian/mysql/dep-5.1
mysys/my_lib.c:
Auto merged
Diffstat (limited to 'mysys/my_lib.c')
| -rw-r--r-- | mysys/my_lib.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mysys/my_lib.c b/mysys/my_lib.c index 03f2d91916d..e96286a94a8 100644 --- a/mysys/my_lib.c +++ b/mysys/my_lib.c @@ -26,9 +26,7 @@ # 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> @@ -52,10 +50,6 @@ #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 |