win32 fixes

diff --git a/ext/sqlite/libsqlite/src/sqlite_config.w32.h b/ext/sqlite/libsqlite/src/sqlite_config.w32.h
index 3e377f79e30256e027c7180176eda30fa72256da..3903ffe95e5984251c4c515859e71b4690afaeb7 100644 (file)
--- a/ext/sqlite/libsqlite/src/sqlite_config.w32.h
+++ b/ext/sqlite/libsqlite/src/sqlite_config.w32.h
@@ -2,7 +2,7 @@
 #if ZTS
 # define THREADSAFE 1
 #endif
-#if !ZEND_DEBUG
+#if !ZEND_DEBUG && !defined(NDEBUG)
 # define NDEBUG
 #endif
 #define SQLITE_PTR_SZ 4
\ No newline at end of file

diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index c5d55a7968c5932282bfe8ae4c8275b558d6a431..fb867615e9a1c074e7f22c60fe9cc4acf1f29a39 100644 (file)
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -559,9 +559,18 @@ static int php_sqlite_authorizer(void *autharg, int access_type, const char *arg
 }
 /* }}} */
 
+static int init_sqlite_globals(zend_sqlite_globals *g)
+{
+       g->assoc_case = 0;
+       return SUCCESS;
+}
+
 PHP_MINIT_FUNCTION(sqlite)
 {
+       ZEND_INIT_MODULE_GLOBALS(sqlite, init_sqlite_globals, NULL);
+       
        REGISTER_INI_ENTRIES();
+
        le_sqlite_db = zend_register_list_destructors_ex(php_sqlite_db_dtor, NULL, "sqlite database", module_number);
        le_sqlite_pdb = zend_register_list_destructors_ex(NULL, php_sqlite_db_dtor, "sqlite database (persistent)", module_number);
        le_sqlite_result = zend_register_list_destructors_ex(php_sqlite_result_dtor, NULL, "sqlite result", module_number);