iliaa Thu Jun 5 19:48:17 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/hyperwave hg_comm.c
/php4/ext/pcntl pcntl.c php_pcntl.h
/php4/ext/sockets php_sockets.h sockets.c
Log:
Fix compile warnings (mostly MFH from 5.0 branch)
Index: php4/ext/hyperwave/hg_comm.c
diff -u php4/ext/hyperwave/hg_comm.c:1.52.8.1 php4/ext/hyperwave/hg_comm.c:1.52.8.2
--- php4/ext/hyperwave/hg_comm.c:1.52.8.1 Tue Dec 31 11:34:39 2002
+++ php4/ext/hyperwave/hg_comm.c Thu Jun 5 19:48:16 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: hg_comm.c,v 1.52.8.1 2002/12/31 16:34:39 sebastian Exp $ */
+/* $Id: hg_comm.c,v 1.52.8.2 2003/06/05 23:48:16 iliaa Exp $ */
/* #define HW_DEBUG */
@@ -31,7 +31,7 @@
#include <string.h>
#include <sys/types.h>
#ifdef PHP_WIN32
-# include <winsock.h>
+# include <winsock2.h>
# define EWOULDBLOCK WSAEWOULDBLOCK
# define ETIMEDOUT WSAETIMEDOUT
# define bcopy memcpy
@@ -42,6 +42,7 @@
# include <netdb.h>
# include <unistd.h>
# include <sys/param.h>
+# include <arpa/inet.h>
#endif
#include <fcntl.h>
#include <errno.h>
@@ -5034,10 +5035,8 @@
switch(hostptr->h_addrtype) {
struct in_addr *ptr1;
- char *ptr;
case AF_INET:
- ptr = hostptr->h_addr_list[0];
- ptr1 = (struct in_addr *) ptr;
+ ptr1 = (struct in_addr *) hostptr->h_addr_list[0];
hostip = inet_ntoa(*ptr1);
break;
default:
@@ -5221,10 +5220,8 @@
switch(hostptr->h_addrtype) {
struct in_addr *ptr1;
- char *ptr;
case AF_INET:
- ptr = hostptr->h_addr_list[0];
- ptr1 = (struct in_addr *) ptr;
+ ptr1 = (struct in_addr *) hostptr->h_addr_list[0];
hostip = inet_ntoa(*ptr1);
break;
default:
@@ -5403,10 +5400,8 @@
switch(hostptr->h_addrtype) {
struct in_addr *ptr1;
- char *ptr;
case AF_INET:
- ptr = hostptr->h_addr_list[0];
- ptr1 = (struct in_addr *) ptr;
+ ptr1 = (struct in_addr *) hostptr->h_addr_list[0];
hostip = inet_ntoa(*ptr1);
break;
default:
Index: php4/ext/pcntl/pcntl.c
diff -u php4/ext/pcntl/pcntl.c:1.28.4.2 php4/ext/pcntl/pcntl.c:1.28.4.3
--- php4/ext/pcntl/pcntl.c:1.28.4.2 Tue Dec 31 11:35:08 2002
+++ php4/ext/pcntl/pcntl.c Thu Jun 5 19:48:17 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pcntl.c,v 1.28.4.2 2002/12/31 16:35:08 sebastian Exp $ */
+/* $Id: pcntl.c,v 1.28.4.3 2003/06/05 23:48:17 iliaa Exp $ */
#define PCNTL_DEBUG 0
@@ -69,6 +69,9 @@
#ifdef COMPILE_DL_PCNTL
ZEND_GET_MODULE(pcntl)
#endif
+
+static void pcntl_signal_handler(int);
+static void pcntl_tick_handler();
void php_register_signal_constants(INIT_FUNC_ARGS)
{
Index: php4/ext/pcntl/php_pcntl.h
diff -u php4/ext/pcntl/php_pcntl.h:1.11.4.1 php4/ext/pcntl/php_pcntl.h:1.11.4.2
--- php4/ext/pcntl/php_pcntl.h:1.11.4.1 Tue Dec 31 11:35:08 2002
+++ php4/ext/pcntl/php_pcntl.h Thu Jun 5 19:48:17 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcntl.h,v 1.11.4.1 2002/12/31 16:35:08 sebastian Exp $ */
+/* $Id: php_pcntl.h,v 1.11.4.2 2003/06/05 23:48:17 iliaa Exp $ */
#ifndef PHP_PCNTL_H
#define PHP_PCNTL_H
@@ -50,10 +50,6 @@
PHP_FUNCTION(pcntl_wstopsig);
PHP_FUNCTION(pcntl_signal);
PHP_FUNCTION(pcntl_exec);
-
-static void pcntl_signal_handler(int);
-static void pcntl_tick_handler();
-
ZEND_BEGIN_MODULE_GLOBALS(pcntl)
HashTable php_signal_table;
Index: php4/ext/sockets/php_sockets.h
diff -u php4/ext/sockets/php_sockets.h:1.26.2.3 php4/ext/sockets/php_sockets.h:1.26.2.4
--- php4/ext/sockets/php_sockets.h:1.26.2.3 Thu Apr 17 19:20:58 2003
+++ php4/ext/sockets/php_sockets.h Thu Jun 5 19:48:17 2003
@@ -22,7 +22,7 @@
#ifndef PHP_SOCKETS_H
#define PHP_SOCKETS_H
-/* $Id: php_sockets.h,v 1.26.2.3 2003/04/17 23:20:58 sniper Exp $ */
+/* $Id: php_sockets.h,v 1.26.2.4 2003/06/05 23:48:17 iliaa Exp $ */
#if HAVE_SOCKETS
@@ -100,12 +100,6 @@
typedef struct {
zend_bool use_system_read;
} php_sockets_globals;
-
-/* Prototypes */
-static int php_open_listen_sock(php_socket **php_sock, int port, int backlog
TSRMLS_DC);
-static int php_accept_connect(php_socket *in_sock, php_socket **new_sock, struct
sockaddr *la TSRMLS_DC);
-static int php_read(int bsd_socket, void *buf, size_t maxlen, int flags);
-static char *php_strerror(int error TSRMLS_DC);
ZEND_BEGIN_MODULE_GLOBALS(sockets)
int last_error;
Index: php4/ext/sockets/sockets.c
diff -u php4/ext/sockets/sockets.c:1.125.2.16 php4/ext/sockets/sockets.c:1.125.2.17
--- php4/ext/sockets/sockets.c:1.125.2.16 Fri Apr 25 04:10:23 2003
+++ php4/ext/sockets/sockets.c Thu Jun 5 19:48:17 2003
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sockets.c,v 1.125.2.16 2003/04/25 08:10:23 sniper Exp $ */
+/* $Id: sockets.c,v 1.125.2.17 2003/06/05 23:48:17 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -82,6 +82,7 @@
#define PF_INET AF_INET
#endif
+static char *php_strerror(int error TSRMLS_DC);
#define PHP_NORMAL_READ 0x0001
#define PHP_BINARY_READ 0x0002
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
