[PHP-CVS] svn: /php/php-src/branches/PHP_5_4/main/ php_version.h

2011-05-15 Thread Pierre Joye
pajoye   Sun, 15 May 2011 20:07:33 +

Revision: http://svn.php.net/viewvc?view=revision&revision=311062

Log:
- version

Changed paths:
U   php/php-src/branches/PHP_5_4/main/php_version.h

Modified: php/php-src/branches/PHP_5_4/main/php_version.h
===
--- php/php-src/branches/PHP_5_4/main/php_version.h 2011-05-15 18:32:17 UTC 
(rev 311061)
+++ php/php-src/branches/PHP_5_4/main/php_version.h 2011-05-15 20:07:33 UTC 
(rev 311062)
@@ -1,8 +1,8 @@
 /* automatically generated by configure */
 /* edit configure.in to change version number */
 #define PHP_MAJOR_VERSION 5
-#define PHP_MINOR_VERSION 3
-#define PHP_RELEASE_VERSION 99
+#define PHP_MINOR_VERSION 4
+#define PHP_RELEASE_VERSION 0
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.3.99-dev"
-#define PHP_VERSION_ID 50399
+#define PHP_VERSION "5.4.0-dev"
+#define PHP_VERSION_ID 50400

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

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_4/TSRM/acconfig.h branches/PHP_5_4/TSRM/build.mk branches/PHP_5_4/TSRM/configure.in branches/PHP_5_4/Zend/acconfig.h branches/PHP_5_4/Zend/build.mk branches

2011-05-15 Thread Rasmus Lerdorf
rasmus   Mon, 16 May 2011 00:14:47 +

Revision: http://svn.php.net/viewvc?view=revision&revision=311067

Log:
Get rid of autoconf warnings

Changed paths:
D   php/php-src/branches/PHP_5_4/TSRM/acconfig.h
U   php/php-src/branches/PHP_5_4/TSRM/build.mk
U   php/php-src/branches/PHP_5_4/TSRM/configure.in
D   php/php-src/branches/PHP_5_4/Zend/acconfig.h
U   php/php-src/branches/PHP_5_4/Zend/build.mk
U   php/php-src/branches/PHP_5_4/Zend/configure.in
D   php/php-src/branches/PHP_5_4/acconfig.h.in
U   php/php-src/branches/PHP_5_4/build/build.mk
U   php/php-src/branches/PHP_5_4/build/build2.mk
U   php/php-src/branches/PHP_5_4/configure.in
D   php/php-src/trunk/TSRM/acconfig.h
U   php/php-src/trunk/TSRM/build.mk
U   php/php-src/trunk/TSRM/configure.in
D   php/php-src/trunk/Zend/acconfig.h
U   php/php-src/trunk/Zend/build.mk
U   php/php-src/trunk/Zend/configure.in
D   php/php-src/trunk/acconfig.h.in
U   php/php-src/trunk/build/build.mk
U   php/php-src/trunk/build/build2.mk
U   php/php-src/trunk/configure.in
U   php/php-src/trunk/main/php_version.h

Deleted: php/php-src/branches/PHP_5_4/TSRM/acconfig.h
===
--- php/php-src/branches/PHP_5_4/TSRM/acconfig.h	2011-05-15 23:52:15 UTC (rev 311066)
+++ php/php-src/branches/PHP_5_4/TSRM/acconfig.h	2011-05-16 00:14:47 UTC (rev 311067)
@@ -1 +0,0 @@
-#undef PTHREADS

Modified: php/php-src/branches/PHP_5_4/TSRM/build.mk
===
--- php/php-src/branches/PHP_5_4/TSRM/build.mk	2011-05-15 23:52:15 UTC (rev 311066)
+++ php/php-src/branches/PHP_5_4/TSRM/build.mk	2011-05-16 00:14:47 UTC (rev 311067)
@@ -33,7 +33,7 @@
 aclocal.m4: configure.in acinclude.m4
 	aclocal

-$(config_h_in): configure.in acconfig.h
+$(config_h_in): configure.in
 # explicitly remove target since autoheader does not seem to work
 # correctly otherwise (timestamps are not updated)
 	@rm -f $@

Modified: php/php-src/branches/PHP_5_4/TSRM/configure.in
===
--- php/php-src/branches/PHP_5_4/TSRM/configure.in	2011-05-15 23:52:15 UTC (rev 311066)
+++ php/php-src/branches/PHP_5_4/TSRM/configure.in	2011-05-16 00:14:47 UTC (rev 311067)
@@ -7,6 +7,10 @@
 AM_INIT_AUTOMAKE(TSRM, 1.0, nodefine)
 AM_CONFIG_HEADER(tsrm_config.h)

+AH_TOP([
+#undef PTHREADS
+])
+
 sinclude(tsrm.m4)

 TSRM_BASIC_CHECKS

Deleted: php/php-src/branches/PHP_5_4/Zend/acconfig.h
===
--- php/php-src/branches/PHP_5_4/Zend/acconfig.h	2011-05-15 23:52:15 UTC (rev 311066)
+++ php/php-src/branches/PHP_5_4/Zend/acconfig.h	2011-05-16 00:14:47 UTC (rev 311067)
@@ -1,127 +0,0 @@
-/*
-   +--+
-   | Zend Engine  |
-   +--+
-   | Copyright (c) 1998-2011 Zend Technologies Ltd. (http://www.zend.com) |
-   +--+
-   | This source file is subject to version 2.00 of the Zend license, |
-   | that is bundled with this package in the file LICENSE, and is|
-   | available through the world-wide-web at the following url:   |
-   | http://www.zend.com/license/2_00.txt.|
-   | If you did not receive a copy of the Zend license and are unable to  |
-   | obtain it through the world-wide-web, please send a note to  |
-   | lice...@zend.com so we can mail you a copy immediately.  |
-   +--+
-   | Authors: Andi Gutmans |
-   |  Zeev Suraski |
-   +--+
-*/
-
-/* $Id$ */
-
-#if defined(__GNUC__) && __GNUC__ >= 4
-# define ZEND_API __attribute__ ((visibility("default")))
-# define ZEND_DLEXPORT __attribute__ ((visibility("default")))
-#else
-# define ZEND_API
-# define ZEND_DLEXPORT
-#endif
-
-#define ZEND_DLIMPORT
-
-@TOP@
-
-#undef uint
-#undef ulong
-
-/* Define if you want to enable memory limit support */
-#define MEMORY_LIMIT 0
-
-@BOTTOM@
-
-#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS
-
-#ifdef HAVE_STDLIB_H
-# include 
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-# include 
-#endif
-
-#ifdef HAVE_SYS_SELECT_H
-#include 
-#endif
-
-#ifdef HAVE_IEEEFP_H
-# include 
-#endif
-
-#ifdef HAVE_STRING_H
-# include 
-#else
-# include 
-#endif
-
-#if ZEND_BROKEN_SPRINTF
-int zend_sprintf(char *buffer, const char *format, ...);
-#else
-# define zend_sprintf sprintf
-#endif
-
-#include 
-
-/* To enable the is_nan, is_infinite and is_finite PHP functions */
-#ifdef NETWARE
-	#define HAVE_ISNAN 1
-	#define HAVE_ISIN

[PHP-CVS] svn: /SVNROOT/ global_avail

2011-05-15 Thread Rasmus Lerdorf
rasmus   Mon, 16 May 2011 00:19:37 +

Revision: http://svn.php.net/viewvc?view=revision&revision=311068

Log:
Karma for Tyrael

Changed paths:
U   SVNROOT/global_avail

Modified: SVNROOT/global_avail
===
--- SVNROOT/global_avail2011-05-16 00:14:47 UTC (rev 311067)
+++ SVNROOT/global_avail2011-05-16 00:19:37 UTC (rev 311068)
@@ -242,7 +242,7 @@
 avail|val|pecl/bcompiler,phpdoc
 avail|simenec,ttk|pecl/maxdb,phpdoc/en/reference
 avail|ksadlocha|pecl/simplesql
-avail|eyalt,michael,tomerc,rdohms,wimartin,odoucet,danielc,jmfontaine,jeraimee|php/php-src/*/tests,phpdoc
+avail|eyalt,michael,tomerc,rdohms,wimartin,odoucet,danielc,jmfontaine,jeraimee,tyrael|php/php-src/*/tests,phpdoc
 avail|blindman|pecl/colorer
 avail|mike|pecl/http
 avail|gabe|pecl/intercept

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