Mercurial > hg > nginx
comparison src/core/ngx_cycle.c @ 5360:3d2d3e1cf427
Win32: MinGW GCC compatibility.
Several warnings silenced, notably (ngx_socket_t) -1 is now checked
on socket operations instead of -1, as ngx_socket_t is unsigned on win32
and gcc complains on comparison.
With this patch, it's now possible to compile nginx using mingw gcc,
with options we normally compile on win32.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Wed, 04 Sep 2013 20:48:28 +0400 |
| parents | e088695737c3 |
| children | d8ee8ef5dcde |
comparison
equal
deleted
inserted
replaced
| 5359:2fda9065d0f4 | 5360:3d2d3e1cf427 |
|---|---|
| 541 #endif | 541 #endif |
| 542 break; | 542 break; |
| 543 } | 543 } |
| 544 } | 544 } |
| 545 | 545 |
| 546 if (nls[n].fd == -1) { | 546 if (nls[n].fd == (ngx_socket_t) -1) { |
| 547 nls[n].open = 1; | 547 nls[n].open = 1; |
| 548 } | 548 } |
| 549 } | 549 } |
| 550 | 550 |
| 551 } else { | 551 } else { |
| 647 /* close the unnecessary listening sockets */ | 647 /* close the unnecessary listening sockets */ |
| 648 | 648 |
| 649 ls = old_cycle->listening.elts; | 649 ls = old_cycle->listening.elts; |
| 650 for (i = 0; i < old_cycle->listening.nelts; i++) { | 650 for (i = 0; i < old_cycle->listening.nelts; i++) { |
| 651 | 651 |
| 652 if (ls[i].remain || ls[i].fd == -1) { | 652 if (ls[i].remain || ls[i].fd == (ngx_socket_t) -1) { |
| 653 continue; | 653 continue; |
| 654 } | 654 } |
| 655 | 655 |
| 656 if (ngx_close_socket(ls[i].fd) == -1) { | 656 if (ngx_close_socket(ls[i].fd) == -1) { |
| 657 ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno, | 657 ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno, |
| 811 return NULL; | 811 return NULL; |
| 812 } | 812 } |
| 813 | 813 |
| 814 ls = cycle->listening.elts; | 814 ls = cycle->listening.elts; |
| 815 for (i = 0; i < cycle->listening.nelts; i++) { | 815 for (i = 0; i < cycle->listening.nelts; i++) { |
| 816 if (ls[i].fd == -1 || !ls[i].open) { | 816 if (ls[i].fd == (ngx_socket_t) -1 || !ls[i].open) { |
| 817 continue; | 817 continue; |
| 818 } | 818 } |
| 819 | 819 |
| 820 if (ngx_close_socket(ls[i].fd) == -1) { | 820 if (ngx_close_socket(ls[i].fd) == -1) { |
| 821 ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno, | 821 ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno, |