2003-09-19
2003-09-19 12:28:56 by Jonas Wallden <jonasw@roxen.com>
-
5cfe7b8f07e371d15d0ef5ae781e0f0044d6e269
(17 lines)
(+13/-4)
[
Show
| Annotate
]
Branch: 7.2
More Mac OS X poll() fixes.
Rev: src/builtin_functions.c:1.369
Rev: src/modules/HTTPLoop/timeout.c:1.8
5:
\*/
/**/
#include "global.h"
- RCSID("$Id: builtin_functions.c,v 1.368 2003/05/07 12:31:43 mast Exp $");
+ RCSID("$Id: builtin_functions.c,v 1.369 2003/09/19 12:28:52 jonasw Exp $");
#include "interpret.h"
#include "svalue.h"
#include "pike_macros.h"
3411: Inside #if defined(__NT__)
#ifdef __NT__
Sleep(DO_NOT_WARN((int)(left*1000)));
#elif defined(HAVE_POLL)
- poll(NULL,0,(int)(left*1000));
+ {
+ /* MacOS X is stupid, and requires a non-NULL pollfd pointer. */
+ struct pollfd sentinel;
+ poll(&sentinel, 0, (int)(left*1000));
+ }
#else
{
struct timeval t3;
3519: Inside #if defined(__NT__)
#ifdef __NT__
Sleep(DO_NOT_WARN((int)(left*1000)));
#elif defined(HAVE_POLL)
- poll(NULL,0,(int)(left*1000));
+ {
+ /* MacOS X is stupid, and requires a non-NULL pollfd pointer. */
+ struct pollfd sentinel;
+ poll(&sentinel, 0, (int)(left*1000));
+ }
#else
{
struct timeval t3;
4282:
case '\'':
case '+':
case '~':
- break;
+ continue;
/* Attributes */
case '.':
case ':':