RFR(xs): JDK-8214460 fix broken macOS build
Roger Riggs
Roger.Riggs at oracle.com
Thu Nov 29 14:10:07 UTC 2018
Hi Stuart,
Thank you Stuart for cleaning up my mistake. I thought I'd done a
recent CI build.
Regards, Roger
On 11/28/2018 09:18 PM, Stuart Marks wrote:
> Hi all,
>
> https://bugs.openjdk.java.net/browse/JDK-8214460
>
> Please review this small fix to correct broken macOS build caused by
> the fix for JDK-8214014. Patch appended below.
>
> Thanks,
>
> s'marks
>
>
>
> # HG changeset patch
> # User smarks
> # Date 1543457799 28800
> # Wed Nov 28 18:16:39 2018 -0800
> # Node ID 1d520c3761050e01b4e317d0252afefa8b513a7a
> # Parent 41edb8be98b33a2eccb1cdfe0d5870af16d2cd62
> 8214460: MacosX build is broken because of JDK-8214014
> Reviewed-by: dholmes, tbell
>
> diff -r 41edb8be98b3 -r 1d520c376105
> src/java.base/macosx/native/libjava/java_props_macosx.c
> --- a/src/java.base/macosx/native/libjava/java_props_macosx.c Thu Nov
> 29 02:11:44 2018 +0100
> +++ b/src/java.base/macosx/native/libjava/java_props_macosx.c Wed Nov
> 28 18:16:39 2018 -0800
> @@ -416,12 +416,12 @@
> cf_httpHost = NULL,
> cf_httpsHost = NULL,
> cf_ftpHost = NULL,
> - cf_socksHost = NULL,
> + cf_socksHost = NULL;
> int
> httpPort = 80, // Default proxy port values
> httpsPort = 443,
> ftpPort = 21,
> - socksPort = 1080,
> + socksPort = 1080;
>
> CFDictionaryRef dict = SCDynamicStoreCopyProxies(NULL);
> if (dict == NULL) return;
More information about the core-libs-dev
mailing list