diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-28 09:02:51 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-28 09:02:51 +0200 |
| commit | c97ddd06f4c9eceac9b698f07eb5cc168b1006b6 (patch) | |
| tree | bbd008d05f1c1111676b46f092fde8257666d9c2 /mysys/my_os2dirsrch.h | |
| parent | 3595556335b31d908555da9abaa669d3cfcce1e2 (diff) | |
| parent | 88b405c4e21162b73077e000a9b8f7ffe9d6d251 (diff) | |
| download | mariadb-git-c97ddd06f4c9eceac9b698f07eb5cc168b1006b6.tar.gz | |
merge
include/my_sys.h:
Auto merged
sql/item_create.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
innobase/btr/btr0cur.c:
Use local file
scripts/make_binary_distribution.sh:
Add mysql_waitpid
sql/mysqld.cc:
Simple cleanup
Diffstat (limited to 'mysys/my_os2dirsrch.h')
| -rw-r--r-- | mysys/my_os2dirsrch.h | 57 |
1 files changed, 34 insertions, 23 deletions
diff --git a/mysys/my_os2dirsrch.h b/mysys/my_os2dirsrch.h index e894d27b576..3889f628bad 100644 --- a/mysys/my_os2dirsrch.h +++ b/mysys/my_os2dirsrch.h @@ -29,26 +29,35 @@ extern "C" { struct _finddata_t { - unsigned attrib; - //unsigned long time_create; /* -1 for FAT file systems */ - //unsigned long time_access; /* -1 for FAT file systems */ - //unsigned long time_write; - unsigned long size; - char name[260]; - //uint16 wr_date; - //uint16 wr_time; + unsigned attrib; +#ifdef NOT_USED + unsigned long time_create; /* -1 for FAT file systems */ + unsigned long time_access; /* -1 for FAT file systems */ + unsigned long time_write; +#endif + unsigned long size; + char name[260]; +#ifdef NOT_USED + uint16 wr_date; + uint16 wr_time; +#endif }; + struct dirent { - //unsigned attrib; - //unsigned long time_create; /* -1 for FAT file systems */ - //unsigned long time_access; /* -1 for FAT file systems */ - //unsigned long time_write; - //unsigned long size; - char d_name[260]; - //uint16 wr_date; - //uint16 wr_time; +#ifdef NOT_USED + unsigned attrib; + unsigned long time_create; /* -1 for FAT file systems */ + unsigned long time_access; /* -1 for FAT file systems */ + unsigned long time_write; + unsigned long size; +#endif + char d_name[260]; +#ifdef NOT_USED + uint16 wr_date; + uint16 wr_time; +#endif }; struct DIR @@ -62,16 +71,18 @@ DIR *opendir ( char *); struct dirent *readdir (DIR *); int closedir (DIR *); -//#define _A_NORMAL FILE_NORMAL -//#define _A_SUBDIR FILE_DIRECTORY -//#define _A_RDONLY FILE_READONLY +#ifdef NOT_USED +#define _A_NORMAL FILE_NORMAL +#define _A_SUBDIR FILE_DIRECTORY +#define _A_RDONLY FILE_READONLY -//long _findfirst( char*, struct _finddata_t*); -//long _findnext( long, struct _finddata_t*); -//void _findclose( long); +long _findfirst( char*, struct _finddata_t*); +long _findnext( long, struct _finddata_t*); +void _findclose( long); +#endif #ifdef __cplusplus_00 } #endif -#endif // __MY_OS2DIRSRCH2_H__ +#endif /* __MY_OS2DIRSRCH2_H__ */ |