diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-06-01 16:38:01 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-06-01 16:38:01 +0400 |
| commit | bf158eed8388f6c1b4c776b9ff6ee16a335cffa8 (patch) | |
| tree | 27a04705528c5c8baecb74ee4ea6c6c03fdc56e8 /include/my_sys.h | |
| parent | ab6a5b4724ba957756f51f1390ac7447073f5415 (diff) | |
| parent | 5cf1d385706097faab68dbca1053a2842a2dbd34 (diff) | |
| download | mariadb-git-bf158eed8388f6c1b4c776b9ff6ee16a335cffa8.tar.gz | |
Auto-merge from mysql-trunk-bugfixing.
Due to a BZR bug, that merge was done by the following command:
bzr merge -r 'revid:tor.didriksen@sun.com-20100527074248-6qtv0p1ugy6o1hjo..' <mysql-trunk-bugfixing path>
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 727ff7c58b4..cca4d713ca6 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -54,8 +54,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(); } /** @@ -285,7 +283,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; @@ -682,7 +680,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 @@ -711,8 +708,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); |