jani Mon Jul 23 11:53:58 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo pdo.c php_pdo_driver.h
Log:
MFH: sync
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo.c?r1=1.57.2.17.2.8&r2=1.57.2.17.2.9&diff_format=u
Index: php-src/ext/pdo/pdo.c
diff -u php-src/ext/pdo/pdo.c:1.57.2.17.2.8 php-src/ext/pdo/pdo.c:1.57.2.17.2.9
--- php-src/ext/pdo/pdo.c:1.57.2.17.2.8 Mon Jan 1 09:36:04 2007
+++ php-src/ext/pdo/pdo.c Mon Jul 23 11:53:58 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo.c,v 1.57.2.17.2.8 2007/01/01 09:36:04 sebastian Exp $ */
+/* $Id: pdo.c,v 1.57.2.17.2.9 2007/07/23 11:53:58 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -54,12 +54,12 @@
/* for exceptional circumstances */
zend_class_entry *pdo_exception_ce;
-PDO_API zend_class_entry *php_pdo_get_dbh_ce()
+PDO_API zend_class_entry *php_pdo_get_dbh_ce(void)
{
return pdo_dbh_ce;
}
-PDO_API zend_class_entry *php_pdo_get_exception()
+PDO_API zend_class_entry *php_pdo_get_exception(void)
{
return pdo_exception_ce;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/php_pdo_driver.h?r1=1.66.2.11.2.5&r2=1.66.2.11.2.6&diff_format=u
Index: php-src/ext/pdo/php_pdo_driver.h
diff -u php-src/ext/pdo/php_pdo_driver.h:1.66.2.11.2.5
php-src/ext/pdo/php_pdo_driver.h:1.66.2.11.2.6
--- php-src/ext/pdo/php_pdo_driver.h:1.66.2.11.2.5 Wed May 16 19:33:57 2007
+++ php-src/ext/pdo/php_pdo_driver.h Mon Jul 23 11:53:58 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pdo_driver.h,v 1.66.2.11.2.5 2007/05/16 19:33:57 iliaa Exp $ */
+/* $Id: php_pdo_driver.h,v 1.66.2.11.2.6 2007/07/23 11:53:58 jani Exp $ */
#ifndef PHP_PDO_DRIVER_H
#define PHP_PDO_DRIVER_H
@@ -646,8 +646,8 @@
unsigned long data_source_len, struct pdo_data_src_parser
*parsed,
int nparams);
-PDO_API zend_class_entry *php_pdo_get_dbh_ce();
-PDO_API zend_class_entry *php_pdo_get_exception();
+PDO_API zend_class_entry *php_pdo_get_dbh_ce(void);
+PDO_API zend_class_entry *php_pdo_get_exception(void);
PDO_API int pdo_parse_params(pdo_stmt_t *stmt, char *inquery, int inquery_len,
char **outquery, int *outquery_len TSRMLS_DC);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
