diff options
| author | kent@mysql.com <> | 2005-01-04 23:07:29 +0100 |
|---|---|---|
| committer | kent@mysql.com <> | 2005-01-04 23:07:29 +0100 |
| commit | de85fdb78faa8531606e17aa2b2a15d55b5f2b5a (patch) | |
| tree | 3ada71577bf7c0f4243f60e849cdf7c74d869ff8 /mysql-test/my_manage.c | |
| parent | 145ae80b884d098ada72221f4017010ec58e442a (diff) | |
| download | mariadb-git-de85fdb78faa8531606e17aa2b2a15d55b5f2b5a.tar.gz | |
mysql_test_run_new.dsp:
Link mysql_test_run_new as console application
my_manage.c:
The type intptr_t isn't defined for VC 6.0
Changed return type for CreateProcess() to bool
mysql_test_run_new.c:
The type intptr_t isn't defined for VC 6.0
mysqltest.dsp:
Added regex to additional build types for mysqltest
mysqldump.dsp:
Added mysys.lib for linking mysqldump
Diffstat (limited to 'mysql-test/my_manage.c')
| -rw-r--r-- | mysql-test/my_manage.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mysql-test/my_manage.c b/mysql-test/my_manage.c index 472b0d32683..1f006f7ab90 100644 --- a/mysql-test/my_manage.c +++ b/mysql-test/my_manage.c @@ -327,7 +327,7 @@ int spawn(char *path, arg_list_t *al, int join, char *input, int spawn(char *path, arg_list_t *al, int join, char *input, char *output, char *error, HANDLE *pid) { - intptr_t result; + bool result; int i; STARTUPINFO startup_info; PROCESS_INFORMATION process_information; @@ -665,7 +665,11 @@ void del_tree(char *dir) rmdir(dir); #else struct _finddata_t parent; +#if defined(_MSC_VER) && _MSC_VER > 1200 intptr_t handle; +#else + long handle; +#endif /* _MSC_VER && _MSC_VER > 1200 */ char temp[FN_REFLEN]; char mask[FN_REFLEN]; @@ -728,7 +732,11 @@ int removef(const char *format, ...) va_list ap; char path[FN_REFLEN]; struct _finddata_t parent; +#if defined(_MSC_VER) && _MSC_VER > 1200 intptr_t handle; +#else + long handle; +#endif /* _MSC_VER && _MSC_VER > 1200 */ char temp[FN_REFLEN]; char *p; |