diff options
| author | Stig Bakken <ssb@php.net> | 2001-04-22 01:09:14 +0000 |
|---|---|---|
| committer | Stig Bakken <ssb@php.net> | 2001-04-22 01:09:14 +0000 |
| commit | 2cf1b8d3459736457b46c295eb2e8b87acb4f521 (patch) | |
| tree | 01517b5cdaf822ea988cda5d444be6e7b98cc37b /main/php_ini.c | |
| parent | 9dd0231844ab98f306c977e01ca27b6fbd791b93 (diff) | |
| download | php-git-2cf1b8d3459736457b46c295eb2e8b87acb4f521.tar.gz | |
* expanded the following constants and made them available in PHP:
DEFAULT_INCLUDE_PATH
PEAR_INSTALL_DIR
PHP_EXTENSION_DIR
PHP_BINDIR
PHP_LIBDIR
PHP_DATADIR
PHP_SYSCONFDIR
PHP_LOCALSTATEDIR
PHP_CONFIG_FILE_PATH
* no longer generating pear/PEAR.php
* fixed some tests
* some more installer work
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 86e03b55b6..fe3121cf77 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -18,13 +18,13 @@ #include "php.h" +#include "build-defs.h" #include "ext/standard/info.h" #include "zend_ini.h" #include "php_ini.h" #include "ext/standard/dl.h" #include "zend_extensions.h" - typedef struct _php_extension_lists { zend_llist engine; zend_llist functions; @@ -210,7 +210,7 @@ int php_init_config(char *php_ini_path_override) } free_default_location=1; #else - default_location = CONFIGURATION_FILE_PATH; + default_location = PHP_CONFIG_FILE_PATH; free_default_location=0; #endif php_ini_search_path = (char *) emalloc(sizeof(".")+strlen(env_location)+strlen(default_location)+2+1); @@ -332,3 +332,11 @@ PHPAPI int cfg_get_string(char *varname, char **result) *result = tmp->value.str.val; return SUCCESS; } + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * indent-tabs-mode: t + * End: + */ |