From b1aebc0ce63e7a35bbf93b898a75f221e5294911 Mon Sep 17 00:00:00 2001 From: Yousha Aleayoub Date: Thu, 29 Mar 2012 00:22:36 +0430 Subject: [PATCH 1/2] Update win32/inet.c --- win32/inet.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/win32/inet.c b/win32/inet.c index d424c8a5468b7..394346734f380 100644 --- a/win32/inet.c +++ b/win32/inet.c @@ -8,7 +8,7 @@ #if (_WIN32_WINNT < 0x0600) /* Vista/2k8 have these functions */ -PHPAPI int inet_pton(int af, const char* src, void* dst) +PHPAPI short int inet_pton(int af, const char* src, void* dst) { int address_length; struct sockaddr_storage sa; @@ -79,7 +79,7 @@ PHPAPI const char* inet_ntop(int af, const void* src, char* dst, size_t size) #endif -int inet_aton(const char *cp, struct in_addr *inp) { +unsigned short int inet_aton(const char *cp, struct in_addr *inp) { inp->s_addr = inet_addr(cp); if (inp->s_addr == INADDR_NONE) { From 441349d9ca3a93056708c5e8cca2216f1d95dc61 Mon Sep 17 00:00:00 2001 From: Yousha Aleayoub Date: Fri, 30 Mar 2012 10:57:32 +0430 Subject: [PATCH 2/2] Update ext/ext_skel_win32.php --- ext/ext_skel_win32.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/ext/ext_skel_win32.php b/ext/ext_skel_win32.php index c04f037657784..235bec1a123f6 100644 --- a/ext/ext_skel_win32.php +++ b/ext/ext_skel_win32.php @@ -2,8 +2,7 @@ /* $Id$ */ if (php_sapi_name() != "cli") { - echo "Please run this script using the CLI version of PHP\n"; - exit; + exit ("Please run this script using the CLI version of PHP\n"); } /* This script can be used on Win32 systems @@ -18,14 +17,14 @@ $cygwin_path = 'c:\cygwin\bin'; -$path = getenv("PATH"); -putenv("PATH=$cygwin_path;$path"); +$path = getenv('PATH'); +putenv("PATH={$cygwin_path};{$path}"); array_shift($argv); -system("sh ext_skel " . implode(" ", $argv)); +system('sh ext_skel ' . implode(' ', $argv)); -$extname = ""; -$skel = "skeleton"; +$extname = ''; +$skel = 'skeleton'; foreach($argv as $arg) { if (strtolower(substr($arg, 0, 9)) == "--extname") { $extname = substr($arg, 10);