# HG changeset patch # User mbaesken # Date 1563451314 -7200 # Node ID 59d56b8b1a80da69874a7e6d2be8d39a2b53a35d # Parent fb2b47f0e0679213890d332cdf8876bbb64c384e 8228368: avoid incompatible pointer to integer conversion initializing gint in gtk2_interface Reviewed-by: prr diff -r fb2b47f0e067 -r 59d56b8b1a80 src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c --- a/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c Tue Jul 16 14:42:36 2019 +0200 +++ b/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c Thu Jul 18 14:01:54 2019 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2019, 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 @@ -2451,14 +2451,14 @@ static jobject get_integer_property(JNIEnv *env, GtkSettings* settings, const gchar* key) { - gint intval = NULL; + gint intval = 0; (*fp_g_object_get)(settings, key, &intval, NULL); return create_Integer(env, intval); } static jobject get_boolean_property(JNIEnv *env, GtkSettings* settings, const gchar* key) { - gint intval = NULL; + gint intval = 0; (*fp_g_object_get)(settings, key, &intval, NULL); return create_Boolean(env, intval); }