changeset 55744:59d56b8b1a80

8228368: avoid incompatible pointer to integer conversion initializing gint in gtk2_interface Reviewed-by: prr
author mbaesken
date Thu, 18 Jul 2019 14:01:54 +0200
parents fb2b47f0e067
children fa337ff85b9a
files src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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);
 }