cvs: php4 /main streams.c
| From: | Wez Furlong | Date: | Thu, 22 Aug 2002 17:42:18 +0000 |
| Subject: | cvs: php4 /main streams.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-13578@lists.php.net to get a copy of this message | ||
wez Thu Aug 22 13:42:18 2002 EDT
Modified files:
/php4/main streams.c
Log:
Fix compile warnings under win32
Index: php4/main/streams.c
diff -u php4/main/streams.c:1.66 php4/main/streams.c:1.67
--- php4/main/streams.c:1.66 Thu Aug 22 06:16:03 2002
+++ php4/main/streams.c Thu Aug 22 13:42:18 2002
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.66 2002/08/22 10:16:03 helly Exp $ */
+/* $Id: streams.c,v 1.67 2002/08/22 17:42:18 wez Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -388,7 +388,7 @@
/* TODO: look at error returns? */
- while (--maxlen > 0 && php_stream_read(stream, buf, 1 TSRMLS_CC) == 1 &&
*buf++ != '\n')
+ while (--maxlen > 0 && php_stream_read(stream, buf, 1) == 1 && *buf++ !=
'\n')
;
*buf = '\0';
@@ -910,8 +910,11 @@
php_stdio_stream_data *data = (php_stdio_stream_data*) stream->abstract;
size_t size;
int fd;
+#ifdef O_NONBLOCK
+ /* FIXME: make this work for win32 */
int flags;
int oldval;
+#endif
switch(option) {
case PHP_STREAM_OPTION_BLOCKING: