diff options
| author | unknown <monty@mysql.com> | 2004-09-03 02:26:00 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-09-03 02:26:00 +0300 |
| commit | c91fb136413030353b93ac41a7ef8430a6393509 (patch) | |
| tree | e958f1bab0d9af79473522448e052009f5315c5c /include | |
| parent | 9b5a35847bde458a208eec532ee2b579251d9a68 (diff) | |
| parent | 1b51f98e477c6f85ae3f4b82e41c5bc337de127c (diff) | |
| download | mariadb-git-c91fb136413030353b93ac41a7ef8430a6393509.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
sql/sql_prepare.cc:
Auto merged
tests/client_test.c:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/config-win.h | 2 | ||||
| -rw-r--r-- | include/my_getopt.h | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/include/config-win.h b/include/config-win.h index 96a155633eb..0ba8dd2cf43 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -151,9 +151,7 @@ typedef uint rf_SetTimer; #endif /* ERROR is defined in wingdi.h */ -#ifdef ERROR #undef ERROR -#endif /* We need to close files to break connections on shutdown */ #ifndef SIGNAL_WITH_VIO_CLOSE diff --git a/include/my_getopt.h b/include/my_getopt.h index 9d6ef40b399..e6ca1130f85 100644 --- a/include/my_getopt.h +++ b/include/my_getopt.h @@ -54,15 +54,15 @@ struct my_option int app_type; /* To be used by an application */ }; -extern char *disabled_my_option; -extern my_bool my_getopt_print_errors; - typedef my_bool (* my_get_one_option) (int, const struct my_option *, char * ); typedef void (* my_error_reporter) (enum loglevel level, const char *format, ... ); +extern char *disabled_my_option; +extern my_bool my_getopt_print_errors; +extern my_error_reporter my_getopt_error_reporter; + extern int handle_options (int *argc, char ***argv, - const struct my_option *longopts, my_get_one_option, - my_error_reporter ); + const struct my_option *longopts, my_get_one_option); extern void my_print_help(const struct my_option *options); extern void my_print_variables(const struct my_option *options); extern void my_getopt_register_get_addr(gptr* (*func_addr)(const char *, uint, |