summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>1999-04-18 15:09:46 +0000
committerZeev Suraski <zeev@php.net>1999-04-18 15:09:46 +0000
commit2e8fb4e329bf98eb33dffad4c5fb1b49f73e7517 (patch)
tree0cef87cb577ab975c49918f0a17576340233e02c
parent593e603e4b82410c076836d5d3fdbe694c98a620 (diff)
downloadphp-git-2e8fb4e329bf98eb33dffad4c5fb1b49f73e7517.tar.gz
Win32 registry support
-rw-r--r--main/main.c3
-rw-r--r--main/php3_compat.h3
2 files changed, 6 insertions, 0 deletions
diff --git a/main/main.c b/main/main.c
index 0858a4d97e..7443733c94 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 060786a2a4..0fb9097330 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 */