| commit | ebd21aab4506e301bb305d092ca01994fa211ce1 | [log] [tgz] |
|---|---|---|
| author | ysuenaga <unknown> | Tue Jul 21 21:42:53 2020 +0900 |
| committer | Colin Cross <ccross@android.com> | Sat Mar 13 19:39:03 2021 -0800 |
| tree | a88269c112270d136103f64d15bd3b02666d52ab | |
| parent | bac9a4d33ae198440086c96309f06d326f19f2ed [diff] |
8238388: libj2gss/NativeFunc.o "multiple definition" link errors with GCC10 Summary: Fixed libj2gss link errors caused by GCC10 default -fno-common Reviewed-by: weijun (cherry picked from commit a6748ddf86b1b927308c0262de6ffdd1b679058b) Change-Id: I6950086576861e53ff3a387b1b6a429a5dd711c6
diff --git a/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c b/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c index 8a1d0ee..25f8551 100644 --- a/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c +++ b/src/java.security.jgss/unix/native/libj2gss/NativeFunc.c
@@ -28,6 +28,9 @@ #include <dlfcn.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 --git a/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h b/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h index ea704b7..582382e 100644 --- a/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h +++ b/src/java.security.jgss/unix/native/libj2gss/NativeFunc.h
@@ -265,6 +265,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