summaryrefslogtreecommitdiff
path: root/java/openjdk12/files/patch-changeset-57932
diff options
context:
space:
mode:
Diffstat (limited to 'java/openjdk12/files/patch-changeset-57932')
-rw-r--r--java/openjdk12/files/patch-changeset-5793244
1 files changed, 0 insertions, 44 deletions
diff --git a/java/openjdk12/files/patch-changeset-57932 b/java/openjdk12/files/patch-changeset-57932
deleted file mode 100644
index 12acff8b6c8d..000000000000
--- a/java/openjdk12/files/patch-changeset-57932
+++ /dev/null
@@ -1,44 +0,0 @@
-changeset: 57932:9e54ea7d9cd9
-user: qpzhang
-date: Wed Feb 05 20:31:09 2020 +0800
-summary: 8238388: libj2gss/NativeFunc.o "multiple definition" link errors with GCC10
-
-diff -r 932418820c80 -r 9e54ea7d9cd9 src/java.security.jgss/share/native/libj2gss/NativeFunc.c
---- src/java.security.jgss/share/native/libj2gss/NativeFunc.c Wed Feb 05 10:45:39 2020 +0100
-+++ src/java.security.jgss/share/native/libj2gss/NativeFunc.c Wed Feb 05 20:31:09 2020 +0800
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2005, 2020, 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
-@@ -27,6 +27,9 @@
- #include <stdlib.h>
- #include "NativeFunc.h"
-
-+/* global GSS function table */
-+GSS_FUNCTION_TABLE_PTR ftab;
-+
- /* standard GSS method names (ordering is from mapfile) */
- static const char RELEASE_NAME[] = "gss_release_name";
- static const char IMPORT_NAME[] = "gss_import_name";
-diff -r 932418820c80 -r 9e54ea7d9cd9 src/java.security.jgss/share/native/libj2gss/NativeFunc.h
---- src/java.security.jgss/share/native/libj2gss/NativeFunc.h Wed Feb 05 10:45:39 2020 +0100
-+++ src/java.security.jgss/share/native/libj2gss/NativeFunc.h Wed Feb 05 20:31:09 2020 +0800
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2005, 2020, 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
-@@ -277,6 +277,6 @@
- typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
-
- /* global GSS function table */
--GSS_FUNCTION_TABLE_PTR ftab;
-+extern GSS_FUNCTION_TABLE_PTR ftab;
-
- #endif
-