archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 03:54:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8238388: libj2gss/NativeFunc.o "multiple definition" link errors with GCC10

Browse source 
Fixed libj2gss link errors caused by GCC10 default -fno-common

Reviewed-by: weijun
This commit is contained in:
Patrick Zhang 2020-02-05 20:31:09 +08:00
parent ce28a96c28
commit 03721247d8
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/java.security.jgss/share/native/libj2gss/NativeFunc.c
View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -27,6 +27,9 @@
#include <stdlib.h> #include <stdlib.h>
#include "NativeFunc.h" #include "NativeFunc.h"
/* global GSS function table */
GSS_FUNCTION_TABLE_PTR ftab;
/* standard GSS method names (ordering is from mapfile) */ /* standard GSS method names (ordering is from mapfile) */
static const char RELEASE_NAME[] = "gss_release_name"; static const char RELEASE_NAME[] = "gss_release_name";
static const char IMPORT_NAME[] = "gss_import_name"; static const char IMPORT_NAME[] = "gss_import_name";

4
src/java.security.jgss/share/native/libj2gss/NativeFunc.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2019, 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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -277,6 +277,6 @@ typedef struct GSS_FUNCTION_TABLE {
typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR; typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
/* global GSS function table */ /* global GSS function table */
GSS_FUNCTION_TABLE_PTR ftab; extern GSS_FUNCTION_TABLE_PTR ftab;
#endif #endif