--- embedaddon/php/ext/pdo/php_pdo_driver.h	2012/02/21 23:47:58	1.1.1.1
+++ embedaddon/php/ext/pdo/php_pdo_driver.h	2014/06/15 20:03:51	1.1.1.5
@@ -2,7 +2,7 @@
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
   +----------------------------------------------------------------------+
-  | Copyright (c) 1997-2012 The PHP Group                                |
+  | Copyright (c) 1997-2014 The PHP Group                                |
   +----------------------------------------------------------------------+
   | This source file is subject to version 3.01 of the PHP license,      |
   | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: php_pdo_driver.h,v 1.1.1.1 2012/02/21 23:47:58 misho Exp $ */
+/* $Id: php_pdo_driver.h,v 1.1.1.5 2014/06/15 20:03:51 misho Exp $ */
 
 #ifndef PHP_PDO_DRIVER_H
 #define PHP_PDO_DRIVER_H
@@ -72,12 +72,12 @@ enum pdo_param_type {
 	/* get_col ptr should point to a zval*
 	   and the driver is responsible for adding correct type information to get_column_meta()
 	 */
-	PDO_PARAM_ZVAL
+	PDO_PARAM_ZVAL,
+
+	/* magic flag to denote a parameter as being input/output */
+	PDO_PARAM_INPUT_OUTPUT = 0x80000000
 };
 
-/* magic flag to denote a parameter as being input/output */
-#define	PDO_PARAM_INPUT_OUTPUT 	0x80000000	
-
 #define PDO_PARAM_FLAGS			0xFFFF0000
 
 #define PDO_PARAM_TYPE(x)		((x) & ~PDO_PARAM_FLAGS)
@@ -310,6 +310,7 @@ struct pdo_dbh_methods {
 	pdo_dbh_check_liveness_func	check_liveness;
 	pdo_dbh_get_driver_methods_func get_driver_methods;
 	pdo_dbh_request_shutdown	persistent_shutdown;
+	pdo_dbh_txn_func		in_transaction;
 };
 
 /* }}} */
@@ -430,10 +431,7 @@ struct _pdo_dbh_t {
        to allow the extending class to escape all the custom handlers
 	   that PDO declares.
     */
-	zend_class_entry *ce; 
-	HashTable *properties;
-	unsigned int in_get:1;
-	unsigned int in_set:1;
+	zend_object std;
 
 	/* driver specific methods */
 	struct pdo_dbh_methods *methods;
@@ -471,7 +469,7 @@ struct _pdo_dbh_t {
 	/* when set, convert int/floats to strings */
 	unsigned stringify:1;
 
-	/* the sum of the number of bits here and the bit fields preceeding should
+	/* the sum of the number of bits here and the bit fields preceding should
 	 * equal 32 */
 	unsigned _reserved_flags:21;
 
@@ -548,10 +546,7 @@ struct _pdo_stmt_t {
        to allow the extending class to escape all the custom handlers
 	   that PDO declares.
     */
-	zend_class_entry *ce; 
-	HashTable *properties;
-	unsigned int in_get:1;
-	unsigned int in_set:1;
+	zend_object std;
 
 	/* driver specifics */
 	struct pdo_stmt_methods *methods;