Skip to content

Commit 8303401

Browse files
Harshitha Onkarpull[bot]
authored andcommitted
8336413: gtk headers : Fix typedef redeclaration of GMainContext and GdkPixbuf
Reviewed-by: prr, dnguyen
1 parent ef6761f commit 8303401

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -55,13 +55,11 @@ typedef enum
5555
} GParamFlags;
5656

5757
/* We define all structure pointers to be void* */
58-
typedef void GMainContext;
5958
typedef void GVfs;
6059

6160
typedef void GdkColormap;
6261
typedef void GdkDrawable;
6362
typedef void GdkGC;
64-
typedef void GdkPixbuf;
6563
typedef void GdkPixmap;
6664

6765
typedef void GtkFixed;

src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -180,8 +180,6 @@ typedef enum _cairo_status {
180180
} cairo_status_t;
181181

182182
/* We define all structure pointers to be void* */
183-
typedef void GdkPixbuf;
184-
typedef void GMainContext;
185183
typedef void GVfs;
186184

187185
typedef void GdkColormap;

0 commit comments

Comments
 (0)