mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
unknown 2008-02-19 11:41:12 +01:00
parent a680bc7688
commit 8665ae2c1f
6 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/get_password.c
View file

@ -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;

1
dbug/dbug.c
View file

@ -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("");

1
include/config-win.h
View file

@ -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

2
include/thr_alarm.h
View file

@ -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

2
libmysql/dll.c
View file

@ -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)
{

2
mysys/thr_alarm.c
View file

@ -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;