Commit 550b2ee4 authored by unknown's avatar unknown

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
parent de1026b2
...@@ -107,7 +107,7 @@ char *get_tty_password(const char *opt_message) ...@@ -107,7 +107,7 @@ char *get_tty_password(const char *opt_message)
* to will not include the eol characters. * 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; char *pos=to,*end=to+length;
......
...@@ -1980,7 +1980,6 @@ static void DBUGOpenFile(CODE_STATE *cs, ...@@ -1980,7 +1980,6 @@ static void DBUGOpenFile(CODE_STATE *cs,
{ {
newfile= !EXISTS(name); newfile= !EXISTS(name);
if (!(fp= fopen(name, append ? "a+" : "w"))) if (!(fp= fopen(name, append ? "a+" : "w")))
)))
{ {
(void) fprintf(stderr, ERR_OPEN, cs->process, name); (void) fprintf(stderr, ERR_OPEN, cs->process, name);
perror(""); perror("");
......
...@@ -168,6 +168,7 @@ typedef uint rf_SetTimer; ...@@ -168,6 +168,7 @@ typedef uint rf_SetTimer;
#define Socket_defined #define Socket_defined
#define my_socket SOCKET #define my_socket SOCKET
#define bool BOOL
#define SIGPIPE SIGINT #define SIGPIPE SIGINT
#define RETQSORTTYPE void #define RETQSORTTYPE void
#define QSORT_TYPE_IS_VOID #define QSORT_TYPE_IS_VOID
......
...@@ -98,7 +98,7 @@ void thr_end_alarm(thr_alarm_t *alarmed); ...@@ -98,7 +98,7 @@ void thr_end_alarm(thr_alarm_t *alarmed);
void end_thr_alarm(my_bool free_structures); void end_thr_alarm(my_bool free_structures);
sig_handler process_alarm(int); sig_handler process_alarm(int);
#ifndef thr_got_alarm #ifndef thr_got_alarm
bool thr_got_alarm(thr_alarm_t *alrm); my_bool thr_got_alarm(thr_alarm_t *alrm);
#endif #endif
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <my_sys.h> #include <my_sys.h>
#include <my_pthread.h> #include <my_pthread.h>
static bool libmysql_inited=0; static my_bool libmysql_inited=0;
void libmysql_init(void) void libmysql_init(void)
{ {
......
...@@ -632,7 +632,7 @@ my_bool thr_alarm(thr_alarm_t *alrm, uint sec, ALARM *alarm) ...@@ -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; thr_alarm_t alrm= *alrm_ptr;
MSG msg; MSG msg;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment