Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

Make Win32 happy with the recent changes.

migration/INITIAL
Zeev Suraski 27 years ago
parent
f432c05c3f
commit
5e8c322859
11 changed files with 95 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ext/standard/exec.c
  2. 2
      ext/standard/file.c
  3. 2
      ext/standard/formatted_print.c
  4. 13
      ext/standard/fsock.c
  5. 10
      ext/standard/fsock.h
  6. 6
      ext/standard/info.c
  7. 2
      ext/standard/pack.c
  8. 2
      ext/standard/string.c
  9. 2
      ext/standard/var.c
  10. 1
      main/main.c
  11. 129
      php4.dsp

2
ext/standard/exec.c
View File

@ -36,7 +36,7 @@
#include <ctype.h>
#include "php3_string.h"
#include "safe_mode.h"
#include "head.h"
#include "functions/head.h"
#include "exec.h"
#include "php_globals.h"

2
ext/standard/file.c
View File

@ -49,7 +49,7 @@
#include <sys/socket.h>
/* #include <sys/uio.h> */
#endif
#include "head.h"
#include "functions/head.h"
#include "safe_mode.h"
#include "php3_string.h"
#include "file.h"

2
ext/standard/formatted_print.c
View File

@ -34,7 +34,7 @@
#include "tls.h"
#endif
#include "php.h"
#include "head.h"
#include "functions/head.h"
#include "php3_string.h"
#include "zend_execute.h"
#include <stdio.h>

13
ext/standard/fsock.c
View File

@ -60,7 +60,7 @@
#include "base64.h"
#include "file.h"
#include "post.h"
#include "functions/post.h"
#include "url.h"
#include "fsock.h"
@ -96,8 +96,8 @@ struct php3i_sockbuf {
static struct php3i_sockbuf *phpsockbuf;
static int php3_minit_fsock(INIT_FUNC_ARGS);
static int php3_mshutdown_fsock(void);
static int php3_rshutdown_fsock(void);
static int php3_mshutdown_fsock(SHUTDOWN_FUNC_ARGS);
static int php3_rshutdown_fsock(SHUTDOWN_FUNC_ARGS);
php3_module_entry fsock_module_entry = {
"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)
sockbuf->next = phpsockbuf;
phpsockbuf = sockbuf;
} else {
int needlen = sockbuf->writepos + buflen;
uint needlen = sockbuf->writepos + buflen;
if (needlen > sockbuf->readbuflen) {
sockbuf->readbuflen += maxlen;
sockbuf->readbuf = erealloc(sockbuf->readbuf, sockbuf->readbuflen);
@ -440,7 +441,7 @@ static int php3_minit_fsock(INIT_FUNC_ARGS)
/* }}} */
/* {{{ php3_mshutdown_fsock */
static int php3_mshutdown_fsock(void)
static int php3_mshutdown_fsock(SHUTDOWN_FUNC_ARGS)
{
#ifndef THREAD_SAFE
_php3_hash_destroy(&ht_socks);
@ -451,7 +452,7 @@ static int php3_mshutdown_fsock(void)
/* }}} */
/* {{{ php3_rshutdown_fsock() */
static int php3_rshutdown_fsock(void)
static int php3_rshutdown_fsock(SHUTDOWN_FUNC_ARGS)
{
struct php3i_sockbuf *sockbuf = phpsockbuf, *this;

10
ext/standard/fsock.h
View File

@ -32,7 +32,17 @@
#ifndef _FSOCK_H
#define _FSOCK_H
#if WIN32|WINNT
# ifndef WINNT
# define WINNT 1
# endif
#undef FD_SETSIZE
#include "arpa/inet.h"
#endif
#if HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
extern php3_module_entry fsock_module_entry;
#define fsock_module_ptr &fsock_module_entry

6
ext/standard/info.c
View File

@ -33,7 +33,7 @@
#include "php.h"
#include "php_ini.h"
#include "php_globals.h"
#include "head.h"
#include "functions/head.h"
#include "info.h"
#ifndef MSVC5
#include "build-defs.h"
@ -108,7 +108,7 @@ void _php3_info(void)
PUTS("<img src=\"");
PUTS(GLOBAL(php3_rqst)->uri);
/*PUTS(GLOBAL(php3_rqst)->uri);*/
PUTS("?=PHPE9568F34-D428-11d2-A769-00AA001ACF42\" border=\"0\" width=\"100\" height=\"56\" align=\"right\">\n");
php3_printf("<center><h1>PHP Version %s</h1></center>\n", PHP_VERSION);
PUTS("<p>by <a href=\"mailto:rasmus@lerdorf.on.ca\">Rasmus Lerdorf</a>,\n");
@ -387,7 +387,7 @@ void _php3_info(void)
PUTS("<table width=\"100%%\"><tr>\n");
php3_printf("<td><h2>Zend</h2>This program makes use of the Zend scripting language engine:<br><pre>%s</pre></td>", get_zend_version());
PUTS("<td width=\"100\"><a href=\"http://www.zend.com/\"><img src=\"");
PUTS(GLOBAL(php3_rqst)->uri);
/*PUTS(GLOBAL(php3_rqst)->uri);*/
PUTS("?=PHPE9568F35-D428-11d2-A769-00AA001ACF42\" border=\"0\" width=\"100\" height=\"89\"></a></td>\n");
PUTS("</tr></table>\n");

2
ext/standard/pack.c
View File

@ -46,7 +46,7 @@
#else
#include <sys/param.h>
#endif
#include "head.h"
#include "functions/head.h"
#include "safe_mode.h"
#include "php3_string.h"
#include "pack.h"

2
ext/standard/string.c
View File

@ -37,7 +37,7 @@
#include <stdio.h>
#include "php.h"
#include "reg.h"
#include "post.h"
#include "functions/post.h"
#include "php3_string.h"
#if HAVE_SETLOCALE
#include <locale.h>

2
ext/standard/var.c
View File

@ -36,7 +36,7 @@
#include "php.h"
#include "fopen-wrappers.h"
#include "reg.h"
#include "post.h"
#include "functions/post.h"
#include "php3_string.h"
#if HAVE_SETLOCALE
#include <locale.h>

1
main/main.c
View File

@ -75,6 +75,7 @@
#include <io.h>
#include <fcntl.h>
#include "win32/syslog.h"
#include "win32/php_registry.h"
#else
#include <syslog.h>
#endif

129
php4.dsp
View File

@ -101,16 +101,7 @@ SOURCE=".\configuration-scanner.c"
# End Source File
# Begin Source File
SOURCE=.\functions\cyr_convert.c
!IF "$(CFG)" == "php4 - Win32 Release"
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "php4 - Win32 Debug"
!ENDIF
SOURCE=.\ext\standard\cyr_convert.c
# End Source File
# Begin Source File
@ -142,7 +133,7 @@ SOURCE=.\php_ini.c
# End Source File
# Begin Source File
SOURCE=.\functions\quot_print.c
SOURCE=.\ext\standard\quot_print.c
# End Source File
# Begin Source File
@ -174,7 +165,7 @@ SOURCE=.\control_structures.h
# End Source File
# Begin Source File
SOURCE=.\functions\cyr_convert.h
SOURCE=.\ext\standard\cyr_convert.h
# End Source File
# Begin Source File
@ -218,7 +209,7 @@ SOURCE=.\php_ini.h
# End Source File
# Begin Source File
SOURCE=.\functions\quot_print.h
SOURCE=.\ext\standard\quot_print.h
# End Source File
# Begin Source File
@ -246,11 +237,11 @@ SOURCE=.\functions\apache.c
# End Source File
# Begin Source File
SOURCE=.\functions\base64.c
SOURCE=.\ext\standard\base64.c
# End Source File
# Begin Source File
SOURCE=.\functions\basic_functions.c
SOURCE=.\ext\standard\basic_functions.c
# End Source File
# Begin Source File
@ -258,15 +249,15 @@ SOURCE=.\functions\bcmath.c
# End Source File
# Begin Source File
SOURCE=.\functions\browscap.c
SOURCE=.\ext\standard\browscap.c
# End Source File
# Begin Source File
SOURCE=.\functions\datetime.c
SOURCE=.\ext\standard\datetime.c
# End Source File
# Begin Source File
SOURCE=.\functions\dir.c
SOURCE=.\ext\standard\dir.c
# End Source File
# Begin Source File
@ -274,27 +265,27 @@ SOURCE=.\functions\dl.c
# End Source File
# Begin Source File
SOURCE=.\functions\dns.c
SOURCE=.\ext\standard\dns.c
# End Source File
# Begin Source File
SOURCE=.\functions\exec.c
SOURCE=.\ext\standard\exec.c
# End Source File
# Begin Source File
SOURCE=.\functions\file.c
SOURCE=.\ext\standard\file.c
# End Source File
# Begin Source File
SOURCE=.\functions\filestat.c
SOURCE=.\ext\standard\filestat.c
# End Source File
# Begin Source File
SOURCE=.\functions\formatted_print.c
SOURCE=.\ext\standard\formatted_print.c
# End Source File
# Begin Source File
SOURCE=.\functions\fsock.c
SOURCE=.\ext\standard\fsock.c
# End Source File
# Begin Source File
@ -302,39 +293,39 @@ SOURCE=.\functions\head.c
# End Source File
# Begin Source File
SOURCE=.\functions\html.c
SOURCE=.\ext\standard\html.c
# End Source File
# Begin Source File
SOURCE=.\functions\image.c
SOURCE=.\ext\standard\image.c
# End Source File
# Begin Source File
SOURCE=.\functions\info.c
SOURCE=.\ext\standard\info.c
# End Source File
# Begin Source File
SOURCE=.\functions\iptc.c
SOURCE=.\ext\standard\iptc.c
# End Source File
# Begin Source File
SOURCE=.\functions\link.c
SOURCE=.\ext\standard\link.c
# End Source File
# Begin Source File
SOURCE=.\functions\mail.c
SOURCE=.\ext\standard\mail.c
# End Source File
# Begin Source File
SOURCE=.\functions\math.c
SOURCE=.\ext\standard\math.c
# End Source File
# Begin Source File
SOURCE=.\functions\md5.c
SOURCE=.\ext\standard\md5.c
# End Source File
# Begin Source File
SOURCE=.\functions\microtime.c
SOURCE=.\ext\standard\microtime.c
# End Source File
# Begin Source File
@ -346,11 +337,11 @@ SOURCE=.\functions\number.c
# End Source File
# Begin Source File
SOURCE=.\functions\pack.c
SOURCE=.\ext\standard\pack.c
# End Source File
# Begin Source File
SOURCE=.\functions\pageinfo.c
SOURCE=.\ext\standard\pageinfo.c
# End Source File
# Begin Source File
@ -358,27 +349,27 @@ SOURCE=.\functions\post.c
# End Source File
# Begin Source File
SOURCE=.\functions\rand.c
SOURCE=.\ext\standard\rand.c
# End Source File
# Begin Source File
SOURCE=.\functions\reg.c
SOURCE=.\ext\standard\reg.c
# End Source File
# Begin Source File
SOURCE=.\functions\soundex.c
SOURCE=.\ext\standard\soundex.c
# End Source File
# Begin Source File
SOURCE=.\functions\string.c
SOURCE=.\ext\standard\string.c
# End Source File
# Begin Source File
SOURCE=.\functions\syslog.c
SOURCE=.\ext\standard\syslog.c
# End Source File
# Begin Source File
SOURCE=.\functions\type.c
SOURCE=.\ext\standard\type.c
# End Source File
# Begin Source File
@ -386,15 +377,15 @@ SOURCE=.\functions\unified_odbc.c
# End Source File
# Begin Source File
SOURCE=.\functions\uniqid.c
SOURCE=.\ext\standard\uniqid.c
# End Source File
# Begin Source File
SOURCE=.\functions\url.c
SOURCE=.\ext\standard\url.c
# End Source File
# Begin Source File
SOURCE=.\functions\var.c
SOURCE=.\ext\standard\var.c
# End Source File
# End Group
# Begin Group "Header Files No. 1"
@ -402,15 +393,15 @@ SOURCE=.\functions\var.c
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\functions\base64.h
SOURCE=.\ext\standard\base64.h
# End Source File
# Begin Source File
SOURCE=.\functions\basic_functions.h
SOURCE=.\ext\standard\basic_functions.h
# End Source File
# Begin Source File
SOURCE=.\functions\datetime.h
SOURCE=.\ext\standard\datetime.h
# End Source File
# Begin Source File
@ -418,35 +409,35 @@ SOURCE=.\functions\dl.h
# End Source File
# Begin Source File
SOURCE=.\functions\dns.h
SOURCE=.\ext\standard\dns.h
# End Source File
# Begin Source File
SOURCE=.\functions\exec.h
SOURCE=.\ext\standard\exec.h
# End Source File
# Begin Source File
SOURCE=.\functions\file.h
SOURCE=.\ext\standard\file.h
# End Source File
# Begin Source File
SOURCE=.\functions\global.h
SOURCE=.\ext\standard\fsock.h
# End Source File
# Begin Source File
SOURCE=.\functions\head.h
SOURCE=.\functions\global.h
# End Source File
# Begin Source File
SOURCE=.\functions\html.h
SOURCE=.\functions\head.h
# End Source File
# Begin Source File
SOURCE=.\functions\mail.h
SOURCE=.\ext\standard\html.h
# End Source File
# Begin Source File
SOURCE=.\functions\md5.h
SOURCE=.\ext\standard\md5.h
# End Source File
# Begin Source File
@ -458,7 +449,7 @@ SOURCE=.\functions\number.h
# End Source File
# Begin Source File
SOURCE=.\functions\pageinfo.h
SOURCE=.\ext\standard\pageinfo.h
# End Source File
# Begin Source File
@ -478,6 +469,14 @@ SOURCE=.\functions\php3_ldap.h
# End Source File
# Begin Source File
SOURCE=.\ext\standard\php3_mail.h
# End Source File
# Begin Source File
SOURCE=.\ext\standard\php3_string.h
# End Source File
# Begin Source File
SOURCE=.\functions\php3_string.h
# End Source File
# Begin Source File
@ -494,23 +493,23 @@ SOURCE=.\functions\phpmath.h
# End Source File
# Begin Source File
SOURCE=.\functions\phpstring.h
SOURCE=.\functions\post.h
# End Source File
# Begin Source File
SOURCE=.\functions\post.h
SOURCE=.\ext\standard\reg.h
# End Source File
# Begin Source File
SOURCE=.\functions\reg.h
SOURCE=.\ext\standard\type.h
# End Source File
# Begin Source File
SOURCE=.\functions\type.h
SOURCE=.\ext\standard\uniqid.h
# End Source File
# Begin Source File
SOURCE=.\functions\url.h
SOURCE=.\ext\standard\url.h
# End Source File
# End Group
# Begin Group "Regular Expressions"
@ -554,6 +553,10 @@ SOURCE=.\win32\readdir.c
# End Source File
# Begin Source File
SOURCE=.\win32\registry.c
# End Source File
# Begin Source File
SOURCE=.\win32\sendmail.c
# End Source File
# Begin Source File
@ -590,6 +593,10 @@ SOURCE=.\win32\param.h
# End Source File
# Begin Source File
SOURCE=.\win32\php_registry.h
# End Source File
# Begin Source File
SOURCE=.\win32\pwd.h
# End Source File
# Begin Source File

Write Preview
Loading…
Cancel
Save