diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-05-28 19:53:26 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-05-28 19:53:26 -0300 |
| commit | aa28461510d211bd67c668a0922d555964e0d834 (patch) | |
| tree | bc66ac79524a3e244caaaa32cf4aa7d20e485018 /include/my_sys.h | |
| parent | 570c6cc87a6217b49b911b35a91d35c9961d7674 (diff) | |
| download | mariadb-git-aa28461510d211bd67c668a0922d555964e0d834.tar.gz | |
Backport: remove dead code.
Reorganize function to reflect that it does not actually uses curses
and that there is no curses variant.
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index ac10628f943..94b76e334b0 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -41,8 +41,6 @@ extern int NEAR my_errno; /* Last error in mysys */ #include <malloc.h> /*for alloca*/ #endif -#define MYSYS_PROGRAM_USES_CURSES() { error_handler_hook = my_message_curses; mysys_uses_curses=1; } -#define MYSYS_PROGRAM_DONT_USE_CURSES() { error_handler_hook = my_message_no_curses; mysys_uses_curses=0;} #define MY_INIT(name); { my_progname= name; my_init(); } /** @@ -272,7 +270,7 @@ extern int NEAR my_umask_dir, NEAR my_recived_signals, /* Signals we have got */ NEAR my_safe_to_handle_signal, /* Set when allowed to SIGTSTP */ NEAR my_dont_interrupt; /* call remember_intr when set */ -extern my_bool NEAR mysys_uses_curses, my_use_symdir; +extern my_bool NEAR my_use_symdir; extern size_t sf_malloc_cur_memory, sf_malloc_max_memory; extern ulong my_default_record_cache_size; @@ -669,7 +667,6 @@ extern int nt_share_delete(const char *name,myf MyFlags); #ifdef _WIN32 /* Windows-only functions (CRT equivalents)*/ -extern File my_sopen(const char *path, int oflag, int shflag, int pmode); extern HANDLE my_get_osfhandle(File fd); extern void my_osmaperr(unsigned long last_error); #endif @@ -698,8 +695,7 @@ extern int my_error_register(const char** (*get_errmsgs) (), int first, int last); extern const char **my_error_unregister(int first, int last); extern void my_message(uint my_err, const char *str,myf MyFlags); -extern void my_message_no_curses(uint my_err, const char *str,myf MyFlags); -extern void my_message_curses(uint my_err, const char *str,myf MyFlags); +extern void my_message_stderr(uint my_err, const char *str, myf MyFlags); extern my_bool my_basic_init(void); extern my_bool my_init(void); extern void my_end(int infoflag); |