diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 08:16:06 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 08:16:06 -0300 |
| commit | b3d22cef93306849f7eaeba2907bcd1099f9e33f (patch) | |
| tree | 5f9985f179d0e43f7caa8e99eaf627865f967ba0 /include/my_sys.h | |
| parent | f54a1182494db9bababccfa83692630bec51ca95 (diff) | |
| download | mariadb-git-b3d22cef93306849f7eaeba2907bcd1099f9e33f.tar.gz | |
WL#5486: Remove code for unsupported platforms
Remove MS-DOS specific code.
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index fb78242a3b5..a426dfb7039 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -42,7 +42,7 @@ typedef struct my_aio_result { #endif /* HAVE_VALGRIND */ #ifndef THREAD -extern int NEAR my_errno; /* Last error in mysys */ +extern int my_errno; /* Last error in mysys */ #else #include <my_pthread.h> #endif @@ -214,7 +214,7 @@ extern int errno; /* declare errno */ #endif /* #ifndef errno */ extern char *home_dir; /* Home directory for user */ extern const char *my_progname; /* program-name (printed in errors) */ -extern char NEAR curr_dir[]; /* Current directory for user */ +extern char curr_dir[]; /* Current directory for user */ extern void (*error_handler_hook)(uint my_err, const char *str,myf MyFlags); extern void (*fatal_error_handler_hook)(uint my_err, const char *str, myf MyFlags); @@ -247,17 +247,17 @@ extern void (*my_sigtstp_cleanup)(void), (*my_sigtstp_restart)(void), (*my_abort_hook)(int); /* Executed when comming from shell */ -extern MYSQL_PLUGIN_IMPORT int NEAR my_umask; /* Default creation mask */ -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 my_use_symdir; +extern MYSQL_PLUGIN_IMPORT int my_umask; /* Default creation mask */ +extern int my_umask_dir, + my_recived_signals, /* Signals we have got */ + my_safe_to_handle_signal, /* Set when allowed to SIGTSTP */ + my_dont_interrupt; /* call remember_intr when set */ +extern my_bool my_use_symdir; extern size_t sf_malloc_cur_memory, sf_malloc_max_memory; extern ulong my_default_record_cache_size; -extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io, - NEAR my_disable_flush_key_blocks, NEAR my_disable_symlinks; +extern my_bool my_disable_locking, my_disable_async_io, + my_disable_flush_key_blocks, my_disable_symlinks; extern char wild_many,wild_one,wild_prefix; extern const char *charsets_dir; /* from default.c */ @@ -650,10 +650,10 @@ extern int my_chsize(File fd,my_off_t newlength, int filler, myf MyFlags); extern int my_sync(File fd, myf my_flags); extern int my_sync_dir(const char *dir_name, myf my_flags); extern int my_sync_dir_by_file(const char *file_name, myf my_flags); -extern void my_error _VARARGS((int nr,myf MyFlags, ...)); -extern void my_printf_error _VARARGS((uint my_err, const char *format, - myf MyFlags, ...)) - ATTRIBUTE_FORMAT(printf, 2, 4); +extern void my_error(int nr,myf MyFlags, ...); +extern void my_printf_error(uint my_err, const char *format, + myf MyFlags, ...) + ATTRIBUTE_FORMAT(printf, 2, 4); extern void my_printv_error(uint error, const char *format, myf MyFlags, va_list ap); extern int my_error_register(const char** (*get_errmsgs) (), |