[PHP-CVS] cvs: php-src /main internal_functions.c.in internal_functions_nw.c internal_functions_win32.c main.c mergesort.c php.h
helly Fri Aug 22 12:59:39 2008 UTC
Modified files:
/php-src/main internal_functions.c.in internal_functions_nw.c
internal_functions_win32.c main.c mergesort.c php.h
Log:
- Cleanup exports and allow to overwrite ext registration
http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions.c.in?r1=1.32&r2=1.33&diff_format=u
Index: php-src/main/internal_functions.c.in
diff -u php-src/main/internal_functions.c.in:1.32
php-src/main/internal_functions.c.in:1.33
--- php-src/main/internal_functions.c.in:1.32 Sat Aug 12 19:41:28 2006
+++ php-src/main/internal_functions.c.inFri Aug 22 12:59:38 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: internal_functions.c.in,v 1.32 2006/08/12 19:41:28 nlopess Exp $ */
+/* $Id: internal_functions.c.in,v 1.33 2008/08/22 12:59:38 helly Exp $ */
#include "php.h"
#include "php_main.h"
@@ -34,9 +34,8 @@
};
#define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *))
-
-int php_register_internal_extensions(TSRMLS_D)
+PHPAPI int php_register_internal_extensions(TSRMLS_D)
{
return php_register_extensions(php_builtin_extensions, EXTCOUNT
TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions_nw.c?r1=1.14&r2=1.15&diff_format=u
Index: php-src/main/internal_functions_nw.c
diff -u php-src/main/internal_functions_nw.c:1.14
php-src/main/internal_functions_nw.c:1.15
--- php-src/main/internal_functions_nw.c:1.14 Mon Dec 31 07:12:18 2007
+++ php-src/main/internal_functions_nw.cFri Aug 22 12:59:38 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: internal_functions_nw.c,v 1.14 2007/12/31 07:12:18 sebastian Exp $ */
+/* $Id: internal_functions_nw.c,v 1.15 2008/08/22 12:59:38 helly Exp $ */
/* {{{ includes
*/
@@ -83,8 +83,7 @@
#define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *))
-
-int php_register_internal_extensions(TSRMLS_D)
+PHPAPI int php_register_internal_extensions(TSRMLS_D)
{
return php_register_extensions(php_builtin_extensions, EXTCOUNT
TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions_win32.c?r1=1.92&r2=1.93&diff_format=u
Index: php-src/main/internal_functions_win32.c
diff -u php-src/main/internal_functions_win32.c:1.92
php-src/main/internal_functions_win32.c:1.93
--- php-src/main/internal_functions_win32.c:1.92Mon Dec 31 07:12:18 2007
+++ php-src/main/internal_functions_win32.c Fri Aug 22 12:59:38 2008
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: internal_functions_win32.c,v 1.92 2007/12/31 07:12:18 sebastian Exp $
*/
+/* $Id: internal_functions_win32.c,v 1.93 2008/08/22 12:59:38 helly Exp $ */
/* {{{ includes
*/
@@ -157,7 +157,7 @@
#define EXTCOUNT (sizeof(php_builtin_extensions)/sizeof(zend_module_entry *))
-int php_register_internal_extensions(TSRMLS_D)
+PHPAPI int php_register_internal_extensions(TSRMLS_D)
{
return php_register_extensions(php_builtin_extensions, EXTCOUNT
TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.779&r2=1.780&diff_format=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.779 php-src/main/main.c:1.780
--- php-src/main/main.c:1.779 Fri Aug 15 19:45:25 2008
+++ php-src/main/main.c Fri Aug 22 12:59:38 2008
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: main.c,v 1.779 2008/08/15 19:45:25 felipe Exp $ */
+/* $Id: main.c,v 1.780 2008/08/22 12:59:38 helly Exp $ */
/* {{{ includes
*/
@@ -91,6 +91,8 @@
#include "rfc1867.h"
/* }}} */
+PHPAPI int (*php_register_internal_extensions_func)(TSRMLS_D) =
php_register_internal_extensions;
+
#ifndef ZTS
php_core_globals core_globals;
#else
@@ -1995,7 +1997,7 @@
zend_register_default_classes(TSRMLS_C);
/* startup extensions staticly compiled in */
- if (php_register_internal_extensions(TSRMLS_C) == FAILURE) {
+ if (php_register_internal_extensions_func(TSRMLS_C) == FAILURE) {
php_printf("Unable to start builtin modules\n");
return FAILURE;
}
http://cvs.php.net/viewvc.cgi/php-src/main/mergesort.c?r1=1.15&r2=1.16&diff_format=u
Index: php-src/main/mergesort.c
diff -u php-src/main/mergesort.c:1.15 php-src/main/mergesort.c:1.16
--- php-src/main/mergesort.c:1.15 Thu Sep 23 15:57:30 2004
+++ php-src/main/mergesort.cFri Aug 22 12:59:38 2008
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*/
-/* $Id: mergesort.c,v 1.15 2004/09/23 15:57:30 hyanantha Exp $ */
+/* $Id: mergesort.c,v 1.16 2008/08/22 12:59:38 helly Exp $ */
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)merge.c8.2 (Berkeley) 2/14/94";
@@ -102,7 +102,7 @@
/* {{{ php_mergesort
* Arguments are as for
[PHP-CVS] cvs: php-src /main internal_functions.c.in internal_functions_nw.c internal_functions_win32.c php_logos.c php_logos.h
nlopess Sat Aug 12 19:41:28 2006 UTC
Modified files:
/php-src/main internal_functions.c.in internal_functions_nw.c
internal_functions_win32.c php_logos.c php_logos.h
Log:
MFH: const/static keywording
http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions.c.in?r1=1.31&r2=1.32&diff_format=u
Index: php-src/main/internal_functions.c.in
diff -u php-src/main/internal_functions.c.in:1.31
php-src/main/internal_functions.c.in:1.32
--- php-src/main/internal_functions.c.in:1.31 Sun Jan 1 13:09:57 2006
+++ php-src/main/internal_functions.c.inSat Aug 12 19:41:28 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: internal_functions.c.in,v 1.31 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id: internal_functions.c.in,v 1.32 2006/08/12 19:41:28 nlopess Exp $ */
#include "php.h"
#include "php_main.h"
@@ -29,7 +29,7 @@
@EXT_INCLUDE_CODE@
-zend_module_entry *php_builtin_extensions[] = {
+static zend_module_entry *php_builtin_extensions[] = {
@EXT_MODULE_PTRS@
};
http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions_nw.c?r1=1.10&r2=1.11&diff_format=u
Index: php-src/main/internal_functions_nw.c
diff -u php-src/main/internal_functions_nw.c:1.10
php-src/main/internal_functions_nw.c:1.11
--- php-src/main/internal_functions_nw.c:1.10 Sun Jan 1 13:09:57 2006
+++ php-src/main/internal_functions_nw.cSat Aug 12 19:41:28 2006
@@ -18,7 +18,7 @@
+--+
*/
-/* $Id: internal_functions_nw.c,v 1.10 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id: internal_functions_nw.c,v 1.11 2006/08/12 19:41:28 nlopess Exp $ */
/* {{{ includes
*/
@@ -62,7 +62,7 @@
/* {{{ php_builtin_extensions[]
*/
-zend_module_entry *php_builtin_extensions[] = {
+static zend_module_entry *php_builtin_extensions[] = {
phpext_standard_ptr,
#if HAVE_BCMATH
phpext_bcmath_ptr,
http://cvs.php.net/viewvc.cgi/php-src/main/internal_functions_win32.c?r1=1.88&r2=1.89&diff_format=u
Index: php-src/main/internal_functions_win32.c
diff -u php-src/main/internal_functions_win32.c:1.88
php-src/main/internal_functions_win32.c:1.89
--- php-src/main/internal_functions_win32.c:1.88Sun Jan 1 13:09:57 2006
+++ php-src/main/internal_functions_win32.c Sat Aug 12 19:41:28 2006
@@ -17,7 +17,7 @@
+--+
*/
-/* $Id: internal_functions_win32.c,v 1.88 2006/01/01 13:09:57 sniper Exp $ */
+/* $Id: internal_functions_win32.c,v 1.89 2006/08/12 19:41:28 nlopess Exp $ */
/* {{{ includes
*/
@@ -102,7 +102,7 @@
/* {{{ php_builtin_extensions[]
*/
-zend_module_entry *php_builtin_extensions[] = {
+static zend_module_entry *php_builtin_extensions[] = {
phpext_standard_ptr
#if HAVE_BCMATH
,phpext_bcmath_ptr
http://cvs.php.net/viewvc.cgi/php-src/main/php_logos.c?r1=1.22&r2=1.23&diff_format=u
Index: php-src/main/php_logos.c
diff -u php-src/main/php_logos.c:1.22 php-src/main/php_logos.c:1.23
--- php-src/main/php_logos.c:1.22 Thu Jul 13 15:05:42 2006
+++ php-src/main/php_logos.cSat Aug 12 19:41:28 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: php_logos.c,v 1.22 2006/07/13 15:05:42 iliaa Exp $ */
+/* $Id: php_logos.c,v 1.23 2006/08/12 19:41:28 nlopess Exp $ */
#include "php.h"
#include "logos.h"
@@ -25,7 +25,7 @@
#include "SAPI.h"
typedef struct _php_info_logo {
- char *mimetype;
+ const char *mimetype;
int mimelen;
const unsigned char *data;
int size;
@@ -33,7 +33,7 @@
HashTable phpinfo_logo_hash;
-PHPAPI int php_register_info_logo(char *logo_string, char *mimetype, const
unsigned char *data, int size)
+PHPAPI int php_register_info_logo(char *logo_string, const char *mimetype,
const unsigned char *data, int size)
{
php_info_logo info_logo;
http://cvs.php.net/viewvc.cgi/php-src/main/php_logos.h?r1=1.11&r2=1.12&diff_format=u
Index: php-src/main/php_logos.h
diff -u php-src/main/php_logos.h:1.11 php-src/main/php_logos.h:1.12
--- php-src/main/php_logos.h:1.11 Thu Jul 13 17:02:43 2006
+++ php-src/main/php_logos.hSat Aug 12 19:41:28 2006
@@ -16,14 +16,14 @@
+--+
*/
-/* $Id: php_logos.h,v 1.11 2006/07/13 17:02:43 tony2001 Exp $ */
+/* $Id: php_logos.h,v 1.12 2006/08/12 19:41:28 nlopess Exp $ */
#ifndef _PHP_LOGOS_H
#define _PHP_LOGOS_H
BEGIN_EXTERN_C()
-PHPAPI int php_register_info_logo(char *logo_string, char *mimetype, const
unsigned char *data, int size);
+PHPAPI int php_register_info_logo(char *logo_string, const char *mimetype,
const unsigned char *data, int size);
PHPAPI int php_unregister_info_logo(char *logo_string);
END_EXTERN_C()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe,
[PHP-CVS] cvs: php-src /main internal_functions.c.in internal_functions_nw.c internal_functions_win32.c
sniper Tue May 24 11:24:33 2005 EDT
Modified files:
/php-src/main internal_functions.c.in internal_functions_nw.c
internal_functions_win32.c
Log:
nuked unused header file
http://cvs.php.net/diff.php/php-src/main/internal_functions.c.in?r1=1.27&r2=1.28&ty=u
Index: php-src/main/internal_functions.c.in
diff -u php-src/main/internal_functions.c.in:1.27
php-src/main/internal_functions.c.in:1.28
--- php-src/main/internal_functions.c.in:1.27 Thu Jan 8 12:33:04 2004
+++ php-src/main/internal_functions.c.inTue May 24 11:24:33 2005
@@ -17,12 +17,11 @@
+--+
*/
-/* $Id: internal_functions.c.in,v 1.27 2004/01/08 17:33:04 sniper Exp $ */
+/* $Id: internal_functions.c.in,v 1.28 2005/05/24 15:24:33 sniper Exp $ */
#include "php.h"
#include "php_main.h"
#include "zend_modules.h"
-#include "internal_functions_registry.h"
#include "zend_compile.h"
#include
#include
http://cvs.php.net/diff.php/php-src/main/internal_functions_nw.c?r1=1.6&r2=1.7&ty=u
Index: php-src/main/internal_functions_nw.c
diff -u php-src/main/internal_functions_nw.c:1.6
php-src/main/internal_functions_nw.c:1.7
--- php-src/main/internal_functions_nw.c:1.6Thu Jan 8 03:17:53 2004
+++ php-src/main/internal_functions_nw.cTue May 24 11:24:33 2005
@@ -18,14 +18,13 @@
+--+
*/
-/* $Id: internal_functions_nw.c,v 1.6 2004/01/08 08:17:53 andi Exp $ */
+/* $Id: internal_functions_nw.c,v 1.7 2005/05/24 15:24:33 sniper Exp $ */
/* {{{ includes
*/
#include "php.h"
#include "php_main.h"
#include "zend_modules.h"
-#include "internal_functions_registry.h"
#include "zend_compile.h"
#include
#include
http://cvs.php.net/diff.php/php-src/main/internal_functions_win32.c?r1=1.84&r2=1.85&ty=u
Index: php-src/main/internal_functions_win32.c
diff -u php-src/main/internal_functions_win32.c:1.84
php-src/main/internal_functions_win32.c:1.85
--- php-src/main/internal_functions_win32.c:1.84Thu Jan 8 03:17:53 2004
+++ php-src/main/internal_functions_win32.c Tue May 24 11:24:33 2005
@@ -17,14 +17,13 @@
+--+
*/
-/* $Id: internal_functions_win32.c,v 1.84 2004/01/08 08:17:53 andi Exp $ */
+/* $Id: internal_functions_win32.c,v 1.85 2005/05/24 15:24:33 sniper Exp $ */
/* {{{ includes
*/
#include "php.h"
#include "php_main.h"
#include "zend_modules.h"
-#include "internal_functions_registry.h"
#include "zend_compile.h"
#include
#include
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /main internal_functions.c.in
sniper Tue Sep 23 12:04:04 2003 EDT Modified files: /php-src/main internal_functions.c.in Log: Removed unnecessary ssl.h include Index: php-src/main/internal_functions.c.in diff -u php-src/main/internal_functions.c.in:1.25 php-src/main/internal_functions.c.in:1.26 --- php-src/main/internal_functions.c.in:1.25 Fri Jun 27 12:41:41 2003 +++ php-src/main/internal_functions.c.inTue Sep 23 12:04:03 2003 @@ -17,7 +17,7 @@ +--+ */ -/* $Id: internal_functions.c.in,v 1.25 2003/06/27 16:41:41 sniper Exp $ */ +/* $Id: internal_functions.c.in,v 1.26 2003/09/23 16:04:03 sniper Exp $ */ #include "php.h" #include "php_main.h" @@ -27,12 +27,6 @@ #include #include #include - -#ifdef HAVE_OPENSSL_EXT -/* zlib typedefs free_func which causes problems if the SSL includes happen - * after zlib.h is included */ -# include -#endif @EXT_INCLUDE_CODE@ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
