php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

MFT: VC10 build support

Browse Source
This commit is contained in:
Kalle Sommer Nielsen
2009-12-03 11:50:32 +00:00
parent 0f0f5f229b
commit 1063c8346b
6 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/sockets/sockets.c
View File

@@ -41,6 +41,12 @@
# include "php_sockets.h"
# include "win32/sockets.h"
# define IS_INVALID_SOCKET(a) (a->bsd_socket == INVALID_SOCKET)
# ifdef EPROTONOSUPPORT
# undef EPROTONOSUPPORT
# endif
# ifdef ECONNRESET
# undef ECONNRESET
# endif
# define EPROTONOSUPPORT WSAEPROTONOSUPPORT
# define ECONNRESET WSAECONNRESET
# ifdef errno

9
ext/standard/flock_compat.h
View File

@@ -42,9 +42,12 @@ PHPAPI int flock(int fd, int operation);
#define PHP_LOCK_NB 4
#ifdef PHP_WIN32
#define EWOULDBLOCK WSAEWOULDBLOCK
# define fsync _commit
# define ftruncate(a, b) chsize(a, b)
# ifdef EWOULDBLOCK
# undef EWOULDBLOCK
# endif
# define EWOULDBLOCK WSAEWOULDBLOCK
# define fsync _commit
# define ftruncate(a, b) chsize(a, b)
#endif /* defined(PHP_WIN32) */
#if !HAVE_INET_ATON

14
main/php_network.h
View File

@@ -34,10 +34,16 @@
#endif
#ifdef PHP_WIN32
#define EWOULDBLOCK WSAEWOULDBLOCK
#define EINPROGRESS WSAEWOULDBLOCK
# define fsync _commit
# define ftruncate(a, b) chsize(a, b)
# ifdef EWOULDBLOCK
# undef EWOULDBLOCK
# endif
# ifdef EINPROGRESS
# undef EINPROGRESS
# endif
# define EWOULDBLOCK WSAEWOULDBLOCK
# define EINPROGRESS WSAEWOULDBLOCK
# define fsync _commit
# define ftruncate(a, b) chsize(a, b)
#endif /* defined(PHP_WIN32) */
#ifndef EWOULDBLOCK

5
main/streams/php_streams_int.h
View File

@@ -49,7 +49,10 @@
#define CHUNK_SIZE 8192
#ifdef PHP_WIN32
#define EWOULDBLOCK WSAEWOULDBLOCK
# ifdef EWOULDBLOCK
# undef EWOULDBLOCK
# endif
# define EWOULDBLOCK WSAEWOULDBLOCK
#endif
#ifndef S_ISREG

2
win32/build/config.w32
View File

@@ -148,7 +148,7 @@ if (VCVERS >= 1400) {
}
}
ARG_WITH('mp', 'Tell VC9 use up to [n,auto,disable] processes for compilation', 'auto');
ARG_WITH('mp', 'Tell VC9+ use up to [n,auto,disable] processes for compilation', 'auto');
if (VCVERS >= 1500 && PHP_MP != 'disable') {
// no from disable-all
if(PHP_MP == 'auto' || PHP_MP == 'no') {

7
win32/php_stdint.h
View File

@@ -238,7 +238,12 @@ typedef uint64_t uintmax_t;
#define INTMAX_C INT64_C
#define UINTMAX_C UINT64_C
static __inline int64_t llabs( int64_t i ) { return i >= 0? i: -i; }
#if _MSC_VER < 1600
static __inline int64_t llabs(int64_t i)
{
return i >= 0 ? i: -i;
}
#endif
#endif // __STDC_CONSTANT_MACROS ]