diff options
| author | Zak Greant <zak@php.net> | 2002-06-07 15:07:55 +0000 |
|---|---|---|
| committer | Zak Greant <zak@php.net> | 2002-06-07 15:07:55 +0000 |
| commit | 9daec6d2278fb671f486100faecbbbc5a42cb863 (patch) | |
| tree | 671ce507dddd5a6f28d3fc9facba1d11fa3e6426 /ext/mysql/libmysql/default.c | |
| parent | fcd6d2b5cda9fc9ef582771b750c93ba09494828 (diff) | |
| download | php-git-9daec6d2278fb671f486100faecbbbc5a42cb863.tar.gz | |
Updating embedded libmysql to version 3.23.48
Diffstat (limited to 'ext/mysql/libmysql/default.c')
| -rw-r--r-- | ext/mysql/libmysql/default.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/mysql/libmysql/default.c b/ext/mysql/libmysql/default.c index d9dbfcf1c6..63aea98212 100644 --- a/ext/mysql/libmysql/default.c +++ b/ext/mysql/libmysql/default.c @@ -132,7 +132,7 @@ void load_defaults(const char *conf_file, const char **groups, &group)) goto err; #endif -#ifdef __EMX__ +#if defined(__EMX__) || defined(OS2) if (getenv("ETC") && search_default_file(&args, &alloc, getenv("ETC"), conf_file, default_ext, &group)) @@ -208,7 +208,7 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, const char *dir, const char *config_file, const char *ext, TYPELIB *group) { - char name[FN_REFLEN+10],buff[FN_REFLEN+1],*ptr,*end,*value,*tmp; + char name[FN_REFLEN+10],buff[4096],*ptr,*end,*value,*tmp; FILE *fp; uint line=0; my_bool read_values=0,found_group=0; @@ -349,7 +349,7 @@ void print_defaults(const char *conf_file, const char **groups) GetWindowsDirectory(name,sizeof(name)); printf("%s\\%s%s ",name,conf_file,have_ext ? "" : windows_ext); #endif -#ifdef __EMX__ +#if defined(__EMX__) || defined(OS2) if (getenv("ETC")) printf("%s\\%s%s ", getenv("ETC"), conf_file, default_ext); #endif |