diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-07-01 12:06:41 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-07-01 12:06:41 +0400 |
| commit | 88ec546247cba2da7785a71255d3100fdce148ca (patch) | |
| tree | b708d98d1300208779f2454df07ffd2ff6a8f988 /include | |
| parent | ea73b23e4a9400452df51b206a56482002ea5d1b (diff) | |
| parent | f3ccf5061fdf7110be6e6f1dd98fe696842081d1 (diff) | |
| download | mariadb-git-88ec546247cba2da7785a71255d3100fdce148ca.tar.gz | |
Manual merge from 5.1.
conflicts:
conflict include/my_alarm.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_alarm.h | 4 | ||||
| -rw-r--r-- | include/my_global.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/my_alarm.h b/include/my_alarm.h index dd2d5642f5f..fa396cf02f9 100644 --- a/include/my_alarm.h +++ b/include/my_alarm.h @@ -36,14 +36,14 @@ extern ulong my_time_to_wait_for_lock; #define ALARM_END (void) signal(SIGALRM,alarm_signal); \ (void) alarm(alarm_old); #define ALARM_TEST my_have_got_alarm -#ifdef DONT_REMEMBER_SIGNAL +#ifdef SIGNAL_HANDLER_RESET_ON_DELIVERY #define ALARM_REINIT (void) alarm(MY_HOW_OFTEN_TO_ALARM); \ (void) signal(SIGALRM,my_set_alarm_variable);\ my_have_got_alarm=0; #else #define ALARM_REINIT (void) alarm((uint) MY_HOW_OFTEN_TO_ALARM); \ my_have_got_alarm=0; -#endif /* DONT_REMEMBER_SIGNAL */ +#endif /* SIGNAL_HANDLER_RESET_ON_DELIVERY */ #else #define ALARM_VARIABLES long alarm_pos=0,alarm_end_pos=MY_HOW_OFTEN_TO_WRITE-1 #define ALARM_INIT diff --git a/include/my_global.h b/include/my_global.h index 7b9c34cd724..b215ba44b57 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -627,8 +627,8 @@ extern "C" int madvise(void *addr, size_t len, int behav); #endif /* Does the system remember a signal handler after a signal ? */ -#ifndef HAVE_BSD_SIGNALS -#define DONT_REMEMBER_SIGNAL +#if !defined(HAVE_BSD_SIGNALS) && !defined(HAVE_SIGACTION) +#define SIGNAL_HANDLER_RESET_ON_DELIVERY #endif #if defined(_lint) || defined(FORCE_INIT_OF_VARS) |