Skip to content

Commit 5e8c322

Browse files
zsuraskizsuraski
committed
Make Win32 happy with the recent changes.
1 parent f432c05 commit 5e8c322

File tree

11 files changed

+95
-76
lines changed

11 files changed

+95
-76
lines changed

‎ext/standard/exec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include <ctype.h>
3737
#include "php3_string.h"
3838
#include "safe_mode.h"
39-
#include "head.h"
39+
#include "functions/head.h"
4040
#include "exec.h"
4141
#include "php_globals.h"
4242

‎ext/standard/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#include <sys/socket.h>
5050
/* #include <sys/uio.h> */
5151
#endif
52-
#include "head.h"
52+
#include "functions/head.h"
5353
#include "safe_mode.h"
5454
#include "php3_string.h"
5555
#include "file.h"

‎ext/standard/formatted_print.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "tls.h"
3535
#endif
3636
#include "php.h"
37-
#include "head.h"
37+
#include "functions/head.h"
3838
#include "php3_string.h"
3939
#include "zend_execute.h"
4040
#include <stdio.h>

‎ext/standard/fsock.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060

6161
#include "base64.h"
6262
#include "file.h"
63-
#include "post.h"
63+
#include "functions/post.h"
6464
#include "url.h"
6565
#include "fsock.h"
6666

@@ -96,8 +96,8 @@ struct php3i_sockbuf {
9696
static struct php3i_sockbuf *phpsockbuf;
9797

9898
static int php3_minit_fsock(INIT_FUNC_ARGS);
99-
static int php3_mshutdown_fsock(void);
100-
static int php3_rshutdown_fsock(void);
99+
static int php3_mshutdown_fsock(SHUTDOWN_FUNC_ARGS);
100+
static int php3_rshutdown_fsock(SHUTDOWN_FUNC_ARGS);
101101

102102
php3_module_entry fsock_module_entry = {
103103
"Socket functions", fsock_functions, php3_minit_fsock, php3_mshutdown_fsock, NULL, php3_rshutdown_fsock, NULL, STANDARD_MODULE_PROPERTIES
@@ -363,7 +363,8 @@ int _php3_sock_fgets(char *buf, int maxlen, int socket)
363363
sockbuf->next = phpsockbuf;
364364
phpsockbuf = sockbuf;
365365
} else {
366-
int needlen = sockbuf->writepos + buflen;
366+
uint needlen = sockbuf->writepos + buflen;
367+
367368
if (needlen > sockbuf->readbuflen) {
368369
sockbuf->readbuflen += maxlen;
369370
sockbuf->readbuf = erealloc(sockbuf->readbuf, sockbuf->readbuflen);
@@ -440,7 +441,7 @@ static int php3_minit_fsock(INIT_FUNC_ARGS)
440441
/* }}} */
441442
/* {{{ php3_mshutdown_fsock */
442443

443-
static int php3_mshutdown_fsock(void)
444+
static int php3_mshutdown_fsock(SHUTDOWN_FUNC_ARGS)
444445
{
445446
#ifndef THREAD_SAFE
446447
_php3_hash_destroy(&ht_socks);
@@ -451,7 +452,7 @@ static int php3_mshutdown_fsock(void)
451452
/* }}} */
452453
/* {{{ php3_rshutdown_fsock() */
453454

454-
static int php3_rshutdown_fsock(void)
455+
static int php3_rshutdown_fsock(SHUTDOWN_FUNC_ARGS)
455456
{
456457
struct php3i_sockbuf *sockbuf = phpsockbuf, *this;
457458

‎ext/standard/fsock.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,17 @@
3232
#ifndef _FSOCK_H
3333
#define _FSOCK_H
3434

35+
#if WIN32|WINNT
36+
# ifndef WINNT
37+
# define WINNT 1
38+
# endif
39+
#undef FD_SETSIZE
40+
#include "arpa/inet.h"
41+
#endif
42+
43+
#if HAVE_NETINET_IN_H
3544
#include <netinet/in.h>
45+
#endif
3646

3747
extern php3_module_entry fsock_module_entry;
3848
#define fsock_module_ptr &fsock_module_entry

‎ext/standard/info.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "php.h"
3434
#include "php_ini.h"
3535
#include "php_globals.h"
36-
#include "head.h"
36+
#include "functions/head.h"
3737
#include "info.h"
3838
#ifndef MSVC5
3939
#include "build-defs.h"
@@ -108,7 +108,7 @@ void _php3_info(void)
108108

109109

110110
PUTS("<img src=\"");
111-
PUTS(GLOBAL(php3_rqst)->uri);
111+
/*PUTS(GLOBAL(php3_rqst)->uri);*/
112112
PUTS("?=PHPE9568F34-D428-11d2-A769-00AA001ACF42\" border=\"0\" width=\"100\" height=\"56\" align=\"right\">\n");
113113
php3_printf("<center><h1>PHP Version %s</h1></center>\n", PHP_VERSION);
114114
PUTS("<p>by <a href=\"mailto:rasmus@lerdorf.on.ca\">Rasmus Lerdorf</a>,\n");
@@ -387,7 +387,7 @@ void _php3_info(void)
387387
PUTS("<table width=\"100%%\"><tr>\n");
388388
php3_printf("<td><h2>Zend</h2>This program makes use of the Zend scripting language engine:<br><pre>%s</pre></td>", get_zend_version());
389389
PUTS("<td width=\"100\"><a href=\"http://www.zend.com/\"><img src=\"");
390-
PUTS(GLOBAL(php3_rqst)->uri);
390+
/*PUTS(GLOBAL(php3_rqst)->uri);*/
391391
PUTS("?=PHPE9568F35-D428-11d2-A769-00AA001ACF42\" border=\"0\" width=\"100\" height=\"89\"></a></td>\n");
392392
PUTS("</tr></table>\n");
393393

‎ext/standard/pack.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
#else
4747
#include <sys/param.h>
4848
#endif
49-
#include "head.h"
49+
#include "functions/head.h"
5050
#include "safe_mode.h"
5151
#include "php3_string.h"
5252
#include "pack.h"

‎ext/standard/string.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <stdio.h>
3838
#include "php.h"
3939
#include "reg.h"
40-
#include "post.h"
40+
#include "functions/post.h"
4141
#include "php3_string.h"
4242
#if HAVE_SETLOCALE
4343
#include <locale.h>

‎ext/standard/var.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "php.h"
3737
#include "fopen-wrappers.h"
3838
#include "reg.h"
39-
#include "post.h"
39+
#include "functions/post.h"
4040
#include "php3_string.h"
4141
#if HAVE_SETLOCALE
4242
#include <locale.h>

‎main/main.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
#include <io.h>
7676
#include <fcntl.h>
7777
#include "win32/syslog.h"
78+
#include "win32/php_registry.h"
7879
#else
7980
#include <syslog.h>
8081
#endif

0 commit comments

Comments
 (0)