Fix for build failures. Putting back "#define bool BOOL" under Windows

until Windows team confers.


client/get_password.c:
  fix for build failure (HPUX etc): no bool in C
dbug/dbug.c:
  typo
include/config-win.h:
  putting back the infamous #define, because without it we have 650
  distinct compiler warnings "forcing value to bool 'true' or 'false'"
  (C4800), Windows team will confer on what to do.
include/thr_alarm.h:
  fix for build failure on Windows
libmysql/dll.c:
  fix for build failure on Windows
mysys/thr_alarm.c:
  fix for build failure on HPUX

6 files changed, 5 insertions, 5 deletions

diff --git a/client/get_password.c b/client/get_password.c
index c01fbcd0da1..c6653183f48 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/dbug/dbug.c b/dbug/dbug.c
index 1e72bb348ed..d7e20b32c2c 100644
--- a/dbug/dbug.c
+++ b/dbug/dbug.c
@@ -1980,7 +1980,6 @@ static void DBUGOpenFile(CODE_STATE *cs,
       {
         newfile= !EXISTS(name);
         if (!(fp= fopen(name, append ? "a+" : "w")))
-		)))
         {
           (void) fprintf(stderr, ERR_OPEN, cs->process, name);
           perror("");
diff --git a/include/config-win.h b/include/config-win.h
index 779f02fc5a0..7a50f28c932 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -168,6 +168,7 @@ typedef uint rf_SetTimer;
 
 #define Socket_defined
 #define my_socket SOCKET
+#define bool BOOL
 #define SIGPIPE SIGINT
 #define RETQSORTTYPE void
 #define QSORT_TYPE_IS_VOID
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/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;