diff options
| author | monty@donna.mysql.com <> | 2001-01-27 01:20:56 +0200 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2001-01-27 01:20:56 +0200 |
| commit | a7c5b9c211cf0d5e1355ece0c65975c56b160bb1 (patch) | |
| tree | bf79d814679a767435990f41e226728ee5927766 /sql/net_serv.cc | |
| parent | 5218a03a1d3780f765572eb2269aaec0bbf860c9 (diff) | |
| download | mariadb-git-a7c5b9c211cf0d5e1355ece0c65975c56b160bb1.tar.gz | |
Portability fixes for OPENBSD, OS2 and Windows
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 5e7abd5d9a7..4c4642034e1 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -271,7 +271,7 @@ net_real_write(NET *net,const char *packet,ulong len) int length; char *pos,*end; thr_alarm_t alarmed; -#if !defined(__WIN__) && !defined(__EMX__) +#if !defined(__WIN__) ALARM alarm_buff; #endif uint retry_count=0; @@ -426,7 +426,7 @@ static void my_net_skip_rest(NET *net, ulong remain, thr_alarm_t *alarmed) if ((int) (length=vio_read(net->vio,(char*) net->buff,remain)) <= 0L) { my_bool interrupted = vio_should_retry(net->vio); - if (!thr_got_alarm(&alarmed) && interrupted) + if (!thr_got_alarm(alarmed) && interrupted) { /* Probably in MIT threads */ if (retry_count++ < RETRY_COUNT) continue; |