subject:"\[PHP\-CVS\] cvs\: php\-src\(PHP_5_2\) \/ext\/standard array.c basic

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard array.c basic_functions.c

2008-05-18 Thread Felipe Pena

Em Seg, 2008-05-19 às 00:16 +0200, Hannes Magnusson escreveu:
> On Sun, May 18, 2008 at 11:50 PM, Felipe Pena <[EMAIL PROTECTED]> wrote:
> > felipe  Sun May 18 21:50:58 2008 UTC
> >
> >  Modified files:  (Branch: PHP_5_2)
> >/php-src/ext/standard   array.c basic_functions.c
> >  Log:
> >  - MFB: Making compatible with 64bit platform
> > http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.71&r2=1.725.2.31.2.72&diff_format=u
> > Index: php-src/ext/standard/basic_functions.c
> > diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.71 
> > php-src/ext/standard/basic_functions.c:1.725.2.31.2.72
> > --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.71  Mon May 12 
> > 08:47:29 2008
> > +++ php-src/ext/standard/basic_functions.c  Sun May 18 21:50:58 2008
> > @@ -17,7 +17,7 @@
> >+--+
> >  */
> >
> > -/* $Id: basic_functions.c,v 1.725.2.31.2.71 2008/05/12 08:47:29 tony2001 
> > Exp $ */
> > +/* $Id: basic_functions.c,v 1.725.2.31.2.72 2008/05/18 21:50:58 felipe Exp 
> > $ */
> >
> >  #include "php.h"
> >  #include "php_streams.h"
> > @@ -3859,9 +3859,17 @@
> >SetEnvironmentVariable(pe->key, "bugbug");
> >  #endif
> >putenv(pe->previous_value);
> > +<<< basic_functions.c
> > +#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7))
> > +===
> >  # if defined(PHP_WIN32)
> > +>>> 1.725.2.31.2.71
> >efree(pe->previous_value);
> > +<<< basic_functions.c
> > +#endif
> > +===
> >  # endif
> > +>>> 1.725.2.31.2.71
> >} else {
> >  # if HAVE_UNSETENV
> >unsetenv(pe->key);
> > @@ -4461,8 +4469,13 @@
> >pe.previous_value = NULL;
> >for (env = environ; env != NULL && *env != NULL; env++) {
> >if (!strncmp(*env, pe.key, pe.key_len) && 
> > (*env)[pe.key_len] == '=') {  /* found it */
> > +<<< basic_functions.c
> > +#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7))
> > +   /* must copy previous value because putenv 
> > can free the string without notice */
> > +===
> >  #if defined(PHP_WIN32)
> >/* must copy previous value because MSVCRT's 
> > putenv can free the string without notice */
> > +>>> 1.725.2.31.2.71
> 
> Multiple cvs conflict alert..

Ops, the 'basic_functions.c' was accidentally.

Thanks.

> 
> -Hannes
-- 
Regards,
Felipe Pena.


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard array.c basic_functions.c

2008-05-18 Thread Hannes Magnusson

On Sun, May 18, 2008 at 11:50 PM, Felipe Pena <[EMAIL PROTECTED]> wrote:
> felipe  Sun May 18 21:50:58 2008 UTC
>
>  Modified files:  (Branch: PHP_5_2)
>/php-src/ext/standard   array.c basic_functions.c
>  Log:
>  - MFB: Making compatible with 64bit platform
> http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.71&r2=1.725.2.31.2.72&diff_format=u
> Index: php-src/ext/standard/basic_functions.c
> diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.71 
> php-src/ext/standard/basic_functions.c:1.725.2.31.2.72
> --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.71  Mon May 12 
> 08:47:29 2008
> +++ php-src/ext/standard/basic_functions.c  Sun May 18 21:50:58 2008
> @@ -17,7 +17,7 @@
>+--+
>  */
>
> -/* $Id: basic_functions.c,v 1.725.2.31.2.71 2008/05/12 08:47:29 tony2001 Exp 
> $ */
> +/* $Id: basic_functions.c,v 1.725.2.31.2.72 2008/05/18 21:50:58 felipe Exp $ 
> */
>
>  #include "php.h"
>  #include "php_streams.h"
> @@ -3859,9 +3859,17 @@
>SetEnvironmentVariable(pe->key, "bugbug");
>  #endif
>putenv(pe->previous_value);
> +<<< basic_functions.c
> +#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7))
> +===
>  # if defined(PHP_WIN32)
> +>>> 1.725.2.31.2.71
>efree(pe->previous_value);
> +<<< basic_functions.c
> +#endif
> +===
>  # endif
> +>>> 1.725.2.31.2.71
>} else {
>  # if HAVE_UNSETENV
>unsetenv(pe->key);
> @@ -4461,8 +4469,13 @@
>pe.previous_value = NULL;
>for (env = environ; env != NULL && *env != NULL; env++) {
>if (!strncmp(*env, pe.key, pe.key_len) && 
> (*env)[pe.key_len] == '=') {  /* found it */
> +<<< basic_functions.c
> +#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7))
> +   /* must copy previous value because putenv 
> can free the string without notice */
> +===
>  #if defined(PHP_WIN32)
>/* must copy previous value because MSVCRT's 
> putenv can free the string without notice */
> +>>> 1.725.2.31.2.71

Multiple cvs conflict alert..

-Hannes

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard array.c basic_functions.c

2008-05-18 Thread Felipe Pena

felipe  Sun May 18 21:50:58 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/standard   array.c basic_functions.c 
  Log:
  - MFB: Making compatible with 64bit platform
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.55&r2=1.308.2.21.2.56&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.55 
php-src/ext/standard/array.c:1.308.2.21.2.56
--- php-src/ext/standard/array.c:1.308.2.21.2.55Wed Mar 12 19:13:00 2008
+++ php-src/ext/standard/array.cSun May 18 21:50:58 2008
@@ -21,7 +21,7 @@
+--+
 */
 
-/* $Id: array.c,v 1.308.2.21.2.55 2008/03/12 19:13:00 felipe Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.56 2008/05/18 21:50:58 felipe Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -2250,7 +2250,7 @@
/* ..and the length */
if (length < 0) {
length = num_in - offset + length;
-   } else if (((unsigned) offset + (unsigned) length) > (unsigned) num_in) 
{
+   } else if (((unsigned long) offset + (unsigned long) length) > 
(unsigned) num_in) {
length = num_in - offset;
}
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.71&r2=1.725.2.31.2.72&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.71 
php-src/ext/standard/basic_functions.c:1.725.2.31.2.72
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.71  Mon May 12 
08:47:29 2008
+++ php-src/ext/standard/basic_functions.c  Sun May 18 21:50:58 2008
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.725.2.31.2.71 2008/05/12 08:47:29 tony2001 Exp $ 
*/
+/* $Id: basic_functions.c,v 1.725.2.31.2.72 2008/05/18 21:50:58 felipe Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -3859,9 +3859,17 @@
SetEnvironmentVariable(pe->key, "bugbug");
 #endif
putenv(pe->previous_value);
+<<< basic_functions.c
+#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7))
+===
 # if defined(PHP_WIN32)
+>>> 1.725.2.31.2.71
efree(pe->previous_value);
+<<< basic_functions.c
+#endif
+===
 # endif
+>>> 1.725.2.31.2.71
} else {
 # if HAVE_UNSETENV
unsetenv(pe->key);
@@ -4461,8 +4469,13 @@
pe.previous_value = NULL;
for (env = environ; env != NULL && *env != NULL; env++) {
if (!strncmp(*env, pe.key, pe.key_len) && 
(*env)[pe.key_len] == '=') {  /* found it */
+<<< basic_functions.c
+#if defined(PHP_WIN32) || (defined (__FreeBSD__) && (__FreeBSD__ < 7))
+   /* must copy previous value because putenv can 
free the string without notice */
+===
 #if defined(PHP_WIN32)
/* must copy previous value because MSVCRT's 
putenv can free the string without notice */
+>>> 1.725.2.31.2.71
pe.previous_value = estrdup(*env);
 #else
pe.previous_value = *env;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard array.c basic_functions.c

Re: [PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard array.c basic_functions.c

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard array.c basic_functions.c

3 matches

Site Navigation

Mail list logo

Footer information