Mercurial > hg > icedtea9-forest > jdk
changeset 5562:b26c04717735
7166687: InetAddress.getLocalHost().getHostName() returns FQDN
Reviewed-by: chegar
author | robm |
---|---|
date | Mon, 07 May 2012 13:34:19 +0100 |
parents | 62557a1336c0 |
children | 48513d156965 |
files | src/solaris/native/java/net/Inet6AddressImpl.c |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/solaris/native/java/net/Inet6AddressImpl.c Mon May 07 16:43:16 2012 +0800 +++ b/src/solaris/native/java/net/Inet6AddressImpl.c Mon May 07 13:34:19 2012 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -73,7 +73,7 @@ } else { // ensure null-terminated hostname[NI_MAXHOST] = '\0'; -#if defined(__linux__) && defined(_ALLBSD_SOURCE) +#if defined(__linux__) || defined(_ALLBSD_SOURCE) /* On Linux/FreeBSD gethostname() says "host.domain.sun.com". On * Solaris gethostname() says "host", so extra work is needed. */