archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8317696: Fix compilation with clang-16

Browse source 
Reviewed-by: djelinski, aivanov
This commit is contained in:
Jan Kratochvil 2023-10-17 08:15:46 +00:00 • committed by Yuri Nesterenko
parent 504b0bdaaa
commit e4329a823b
4 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/java.base/unix/native/libnet/DefaultProxySelector.c
View file

@ -91,13 +91,13 @@ g_type_init_func* my_g_type_init_func = NULL;
typedef struct _GProxyResolver GProxyResolver; typedef struct _GProxyResolver GProxyResolver;
typedef struct _GSocketConnectable GSocketConnectable; typedef struct _GSocketConnectable GSocketConnectable;
typedef struct GError GError; typedef struct GError GError;
typedef GProxyResolver* g_proxy_resolver_get_default_func(); typedef GProxyResolver* g_proxy_resolver_get_default_func(void);
typedef char** g_proxy_resolver_lookup_func(); typedef char** g_proxy_resolver_lookup_func(GProxyResolver* resolver, char* uri, void *null, GError **error_p);
typedef GSocketConnectable* g_network_address_parse_uri_func(); typedef GSocketConnectable* g_network_address_parse_uri_func(char* proxy, unsigned short default_port, GError **error_p);
typedef const char* g_network_address_get_hostname_func(); typedef const char* g_network_address_get_hostname_func(GSocketConnectable* conn);
typedef unsigned short g_network_address_get_port_func(); typedef unsigned short g_network_address_get_port_func(GSocketConnectable* conn);
typedef void g_strfreev_func(); typedef void g_strfreev_func(char** proxies);
typedef void g_clear_error_func(); typedef void g_clear_error_func(GError **error_p);
static g_proxy_resolver_get_default_func* g_proxy_resolver_get_default = NULL; static g_proxy_resolver_get_default_func* g_proxy_resolver_get_default = NULL;
static g_proxy_resolver_lookup_func* g_proxy_resolver_lookup = NULL; static g_proxy_resolver_lookup_func* g_proxy_resolver_lookup = NULL;

2
src/java.desktop/unix/native/common/awt/awt_GraphicsEnv.h
View file

@ -50,8 +50,6 @@
#define MITSHM_PERM_COMMON (0666) #define MITSHM_PERM_COMMON (0666)
#define MITSHM_PERM_OWNER (0600) #define MITSHM_PERM_OWNER (0600)
extern int XShmQueryExtension();
void TryInitMITShm(JNIEnv *env, jint *shmExt, jint *shmPixmaps); void TryInitMITShm(JNIEnv *env, jint *shmExt, jint *shmPixmaps);
void resetXShmAttachFailed(); void resetXShmAttachFailed();
jboolean isXShmAttachFailed(); jboolean isXShmAttachFailed();

6
src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c
View file

@ -1465,7 +1465,7 @@ static GtkWidget *gtk2_get_widget(WidgetType widget_type)
if (init_result = (NULL == gtk2_widgets[_GTK_NOTEBOOK_TYPE])) if (init_result = (NULL == gtk2_widgets[_GTK_NOTEBOOK_TYPE]))
{ {
gtk2_widgets[_GTK_NOTEBOOK_TYPE] = gtk2_widgets[_GTK_NOTEBOOK_TYPE] =
(*fp_gtk_notebook_new)(NULL); (*fp_gtk_notebook_new)();
} }
result = gtk2_widgets[_GTK_NOTEBOOK_TYPE]; result = gtk2_widgets[_GTK_NOTEBOOK_TYPE];
break; break;
@ -1473,7 +1473,7 @@ static GtkWidget *gtk2_get_widget(WidgetType widget_type)
if (init_result = (NULL == gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE])) if (init_result = (NULL == gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE]))
{ {
gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE] = gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE] =
(*fp_gtk_toggle_button_new)(NULL); (*fp_gtk_toggle_button_new)();
} }
result = gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE]; result = gtk2_widgets[_GTK_TOGGLE_BUTTON_TYPE];
break; break;
@ -1482,7 +1482,7 @@ static GtkWidget *gtk2_get_widget(WidgetType widget_type)
if (init_result = (NULL == gtk2_widgets[_GTK_TOOLBAR_TYPE])) if (init_result = (NULL == gtk2_widgets[_GTK_TOOLBAR_TYPE]))
{ {
gtk2_widgets[_GTK_TOOLBAR_TYPE] = gtk2_widgets[_GTK_TOOLBAR_TYPE] =
(*fp_gtk_toolbar_new)(NULL); (*fp_gtk_toolbar_new)();
} }
result = gtk2_widgets[_GTK_TOOLBAR_TYPE]; result = gtk2_widgets[_GTK_TOOLBAR_TYPE];
break; break;

6
src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
View file

@ -1256,7 +1256,7 @@ static GtkWidget *gtk3_get_widget(WidgetType widget_type)
if (init_result = (NULL == gtk3_widgets[_GTK_NOTEBOOK_TYPE])) if (init_result = (NULL == gtk3_widgets[_GTK_NOTEBOOK_TYPE]))
{ {
gtk3_widgets[_GTK_NOTEBOOK_TYPE] = gtk3_widgets[_GTK_NOTEBOOK_TYPE] =
(*fp_gtk_notebook_new)(NULL); (*fp_gtk_notebook_new)();
} }
result = gtk3_widgets[_GTK_NOTEBOOK_TYPE]; result = gtk3_widgets[_GTK_NOTEBOOK_TYPE];
break; break;
@ -1264,7 +1264,7 @@ static GtkWidget *gtk3_get_widget(WidgetType widget_type)
if (init_result = (NULL == gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE])) if (init_result = (NULL == gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE]))
{ {
gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE] = gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE] =
(*fp_gtk_toggle_button_new)(NULL); (*fp_gtk_toggle_button_new)();
} }
result = gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE]; result = gtk3_widgets[_GTK_TOGGLE_BUTTON_TYPE];
break; break;
@ -1273,7 +1273,7 @@ static GtkWidget *gtk3_get_widget(WidgetType widget_type)
if (init_result = (NULL == gtk3_widgets[_GTK_TOOLBAR_TYPE])) if (init_result = (NULL == gtk3_widgets[_GTK_TOOLBAR_TYPE]))
{ {
gtk3_widgets[_GTK_TOOLBAR_TYPE] = gtk3_widgets[_GTK_TOOLBAR_TYPE] =
(*fp_gtk_toolbar_new)(NULL); (*fp_gtk_toolbar_new)();
} }
result = gtk3_widgets[_GTK_TOOLBAR_TYPE]; result = gtk3_widgets[_GTK_TOOLBAR_TYPE];
break; break;