8317696: Fix compilation with clang-16
Reviewed-by: djelinski, aivanov
This commit is contained in:
parent
504b0bdaaa
commit
e4329a823b
@ -91,13 +91,13 @@ g_type_init_func* my_g_type_init_func = NULL;
|
||||
typedef struct _GProxyResolver GProxyResolver;
|
||||
typedef struct _GSocketConnectable GSocketConnectable;
|
||||
typedef struct GError GError;
|
||||
typedef GProxyResolver* g_proxy_resolver_get_default_func();
|
||||
typedef char** g_proxy_resolver_lookup_func();
|
||||
typedef GSocketConnectable* g_network_address_parse_uri_func();
|
||||
typedef const char* g_network_address_get_hostname_func();
|
||||
typedef unsigned short g_network_address_get_port_func();
|
||||
typedef void g_strfreev_func();
|
||||
typedef void g_clear_error_func();
|
||||
typedef GProxyResolver* g_proxy_resolver_get_default_func(void);
|
||||
typedef char** g_proxy_resolver_lookup_func(GProxyResolver* resolver, char* uri, void *null, GError **error_p);
|
||||
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(GSocketConnectable* conn);
|
||||
typedef unsigned short g_network_address_get_port_func(GSocketConnectable* conn);
|
||||
typedef void g_strfreev_func(char** proxies);
|
||||
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_lookup_func* g_proxy_resolver_lookup = NULL;
|
||||
|
@ -50,8 +50,6 @@
|
||||
#define MITSHM_PERM_COMMON (0666)
|
||||
#define MITSHM_PERM_OWNER (0600)
|
||||
|
||||
extern int XShmQueryExtension();
|
||||
|
||||
void TryInitMITShm(JNIEnv *env, jint *shmExt, jint *shmPixmaps);
|
||||
void resetXShmAttachFailed();
|
||||
jboolean isXShmAttachFailed();
|
||||
|
@ -1465,7 +1465,7 @@ static GtkWidget *gtk2_get_widget(WidgetType widget_type)
|
||||
if (init_result = (NULL == 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];
|
||||
break;
|
||||
@ -1473,7 +1473,7 @@ static GtkWidget *gtk2_get_widget(WidgetType widget_type)
|
||||
if (init_result = (NULL == 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];
|
||||
break;
|
||||
@ -1482,7 +1482,7 @@ static GtkWidget *gtk2_get_widget(WidgetType widget_type)
|
||||
if (init_result = (NULL == 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];
|
||||
break;
|
||||
|
@ -1256,7 +1256,7 @@ static GtkWidget *gtk3_get_widget(WidgetType widget_type)
|
||||
if (init_result = (NULL == 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];
|
||||
break;
|
||||
@ -1264,7 +1264,7 @@ static GtkWidget *gtk3_get_widget(WidgetType widget_type)
|
||||
if (init_result = (NULL == 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];
|
||||
break;
|
||||
@ -1273,7 +1273,7 @@ static GtkWidget *gtk3_get_widget(WidgetType widget_type)
|
||||
if (init_result = (NULL == 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];
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user