cvs: php4 /main network.c
| From: | Wez Furlong | Date: | Sat, 16 Mar 2002 11:58:38 +0000 |
| Subject: | cvs: php4 /main network.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-10230@lists.php.net to get a copy of this message | ||
wez Sat Mar 16 06:58:38 2002 EDT
Modified files:
/php4/main network.c
Log:
bring back ptrdiff_t
Index: php4/main/network.c
diff -u php4/main/network.c:1.33 php4/main/network.c:1.34
--- php4/main/network.c:1.33 Fri Mar 15 22:37:11 2002
+++ php4/main/network.c Sat Mar 16 06:58:38 2002
@@ -15,7 +15,7 @@
| Author: Stig Venaas <venaas@uninett.no> |
+----------------------------------------------------------------------+
*/
-/* $Id: network.c,v 1.33 2002/03/16 03:37:11 yohgaki Exp $ */
+/* $Id: network.c,v 1.34 2002/03/16 11:58:38 wez Exp $ */
#define PHP_SOCK_CHUNK_SIZE 8192
#define MAX_CHUNKS_PER_READ 10
@@ -778,9 +778,7 @@
}
if(p) {
-/* FIXME: ptrdiff_t is better, but just not all system support this type */
-/* amount = (ptrdiff_t) p - (ptrdiff_t) READPTR(sock) + 1; */
- amount = (long) p - (long) READPTR(sock) + 1;
+ amount = (ptrdiff_t) p - (ptrdiff_t) READPTR(sock) + 1;
} else {
amount = TOREAD(sock);
}