diff options
author | Mat Booth | 2020-01-28 15:57:33 +0000 |
---|---|---|
committer | Mat Booth | 2020-01-28 15:57:33 +0000 |
commit | 39e14aa3c638f36173f2a8747f524b9273857bee (patch) | |
tree | 7aca47e3f72bf183cf99905210306cd86111bc91 | |
parent | 6b2d3fb5e75ff96a09189fecea372bea818ca888 (diff) | |
download | eclipse.platform.swt-39e14aa3c638f36173f2a8747f524b9273857bee.tar.gz eclipse.platform.swt-39e14aa3c638f36173f2a8747f524b9273857bee.tar.xz eclipse.platform.swt-39e14aa3c638f36173f2a8747f524b9273857bee.zip |
Bug 559637 - SWT fails to build with GCC 10
Fixes build failure caused by global variable with multiple definitions
by declaring it with "extern" in the header
Change-Id: Id34c07cddde21baa4c00e97eb4a457855c37906c
Signed-off-by: Mat Booth <mat.booth@redhat.com>
-rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h index e56bd8f02c..838958528f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os_custom.h @@ -105,7 +105,7 @@ glong g_utf16_offset_to_utf8_offset(const gchar*, glong); glong g_utf8_offset_to_utf16_offset(const gchar*, glong); // Cached JVM pointer: see bug 521487. -JavaVM *cached_jvm; +extern JavaVM *cached_jvm; #define SWT_TYPE_FIXED (swt_fixed_get_type ()) #define SWT_FIXED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SWT_TYPE_FIXED, SwtFixed)) |