diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-01-25 06:12:08 +0100 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-01-25 06:16:56 +0100 |
| commit | 74ca0c98cb8b4e6f75858ca2b2746744f2558493 (patch) | |
| tree | 2999b63239b319ac416e5af7ee4a1e5a80a3ad11 /libc/inet/resolv.c | |
| parent | e64b864d6d4e020a94d3931704ccea50d1a20b82 (diff) | |
| parent | c4b750195714ec7c10aa4de15610c5aae0751c1c (diff) | |
Merge branch 'master' into nptl
Conflicts:
libc/inet/Makefile.in
libc/inet/hostid.c
Synchronise nptl branch with master branch @ c4b750195714ec7c10aa4de15610c5aae0751c1c
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libc/inet/resolv.c')
| -rw-r--r-- | libc/inet/resolv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c index abb84df79..4087f8db8 100644 --- a/libc/inet/resolv.c +++ b/libc/inet/resolv.c @@ -1539,7 +1539,9 @@ FILE * __open_etc_hosts(void) { FILE * fp; if ((fp = fopen("/etc/hosts", "r")) == NULL) { +#ifdef FALLBACK_TO_CONFIG_RESOLVCONF fp = fopen("/etc/config/hosts", "r"); +#endif } return fp; } |