diff --git a/main/main.c b/main/main.c
index 0858a4d97e3d6..7443733c945e5 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1189,6 +1189,9 @@ static void php3_parse(zend_file_handle *primary_file CLS_DC ELS_DC)
 	}
 	_php3_hash_environment();
 
+#if WIN32||WINNT
+	UpdateIniFromRegistry(primary_file->filename);
+#endif
 
 	if (PG(auto_prepend_file) && PG(auto_prepend_file)[0]) {
 		prepend_file.filename = PG(auto_prepend_file);
diff --git a/main/php3_compat.h b/main/php3_compat.h
index 060786a2a43b1..0fb90973308d7 100644
--- a/main/php3_compat.h
+++ b/main/php3_compat.h
@@ -77,4 +77,7 @@
 #define zend_print_pval		zend_print_zval
 #define zend_print_pval_r	zend_print_zval_r
 
+
+#define function_entry		zend_function_entry
+
 #endif							/* _PHP3_COMPAT_H */