diff options
| author | unknown <guilhem@gbichot4.local> | 2008-02-19 18:45:11 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2008-02-19 18:45:11 +0100 |
| commit | 205d448b01b93e3aa10507e933337b51e885f9dd (patch) | |
| tree | ad9d397d605c9c610e9016051ee4cc0e7fad479e | |
| parent | ae25da10a371db0d530ccc2225a730ebc38f8db1 (diff) | |
| download | mariadb-git-205d448b01b93e3aa10507e933337b51e885f9dd.tar.gz | |
fixes for build failures due to my yesterday's changeset forbidding
bool in C.
client/get_password.c:
fix for build failure
include/thr_alarm.h:
fix for build failure
libmysql/dll.c:
fix for build failure
libmysql/get_password.c:
fix for build failure
mysys/thr_alarm.c:
fix for build failure
| -rw-r--r-- | client/get_password.c | 2 | ||||
| -rw-r--r-- | include/thr_alarm.h | 2 | ||||
| -rw-r--r-- | libmysql/dll.c | 2 | ||||
| -rw-r--r-- | libmysql/get_password.c | 2 | ||||
| -rw-r--r-- | mysys/thr_alarm.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/client/get_password.c b/client/get_password.c index 37761d5bb5d..ea024f76fb6 100644 --- a/client/get_password.c +++ b/client/get_password.c @@ -107,7 +107,7 @@ char *get_tty_password(const char *opt_message) * to will not include the eol characters. */ -static void get_password(char *to,uint length,int fd,bool echo) +static void get_password(char *to,uint length,int fd, my_bool echo) { char *pos=to,*end=to+length; diff --git a/include/thr_alarm.h b/include/thr_alarm.h index a2694ba105b..fb906039269 100644 --- a/include/thr_alarm.h +++ b/include/thr_alarm.h @@ -98,7 +98,7 @@ void thr_end_alarm(thr_alarm_t *alarmed); void end_thr_alarm(my_bool free_structures); sig_handler process_alarm(int); #ifndef thr_got_alarm -bool thr_got_alarm(thr_alarm_t *alrm); +my_bool thr_got_alarm(thr_alarm_t *alrm); #endif diff --git a/libmysql/dll.c b/libmysql/dll.c index f5db0bb4669..7aa3b5bf96f 100644 --- a/libmysql/dll.c +++ b/libmysql/dll.c @@ -25,7 +25,7 @@ #include <my_sys.h> #include <my_pthread.h> -static bool libmysql_inited=0; +static my_bool libmysql_inited=0; void libmysql_init(void) { diff --git a/libmysql/get_password.c b/libmysql/get_password.c index 4c251677a66..cbe5fce6949 100644 --- a/libmysql/get_password.c +++ b/libmysql/get_password.c @@ -118,7 +118,7 @@ char *get_tty_password(const char *opt_message) to will not include the eol characters. */ -static void get_password(char *to,uint length,int fd,bool echo) +static void get_password(char *to,uint length,int fd, my_bool echo) { char *pos=to,*end=to+length; diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c index afa5aadece7..b710a7eee39 100644 --- a/mysys/thr_alarm.c +++ b/mysys/thr_alarm.c @@ -632,7 +632,7 @@ my_bool thr_alarm(thr_alarm_t *alrm, uint sec, ALARM *alarm) } -bool thr_got_alarm(thr_alarm_t *alrm_ptr) +my_bool thr_got_alarm(thr_alarm_t *alrm_ptr) { thr_alarm_t alrm= *alrm_ptr; MSG msg; |