mirror of
https://github.com/openjdk/jdk.git
synced 2026-05-29 14:52:52 +00:00
8074836: Resolve disabled warnings for libosxkrb5
8074835: Resolve disabled warnings for libj2gss Reviewed-by: erikj
This commit is contained in:
parent
b8770ac035
commit
d5d207d635
@ -41,7 +41,6 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
|
||||
CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2GSS_SRC)) \
|
||||
$(LIBJAVA_HEADER_FLAGS) \
|
||||
-I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \
|
||||
DISABLED_WARNINGS_gcc := pointer-to-int-cast, \
|
||||
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2gss/mapfile-vers, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
@ -74,6 +73,8 @@ ifneq ($(BUILD_CRYPTO), no)
|
||||
endif
|
||||
|
||||
ifneq ($(BUILD_LIBKRB5_NAME), )
|
||||
# libosxkrb5 needs to call deprecated krb5 APIs so that java
|
||||
# can use the native credentials cache.
|
||||
$(eval $(call SetupNativeCompilation,BUILD_LIBKRB5, \
|
||||
LIBRARY := $(BUILD_LIBKRB5_NAME), \
|
||||
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
|
||||
@ -83,7 +84,7 @@ ifneq ($(BUILD_CRYPTO), no)
|
||||
CFLAGS := $(CFLAGS_JDKLIB) \
|
||||
$(addprefix -I, $(BUILD_LIBKRB5_SRC)) \
|
||||
-I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \
|
||||
DISABLED_WARNINGS_clang := implicit-function-declaration, \
|
||||
DISABLED_WARNINGS_clang := deprecated-declarations, \
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) \
|
||||
$(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
LDFLAGS_SUFFIX := $(BUILD_LIBKRB5_LIBS), \
|
||||
|
||||
@ -25,6 +25,8 @@
|
||||
|
||||
#import "sun_security_krb5_Credentials.h"
|
||||
#import <Kerberos/Kerberos.h>
|
||||
#import <string.h>
|
||||
#import <time.h>
|
||||
|
||||
/*
|
||||
* Based largely on klist.c,
|
||||
|
||||
@ -430,11 +430,11 @@ Java_sun_security_jgss_wrapper_GSSLibStub_canonicalizeName(JNIEnv *env,
|
||||
|
||||
checkStatus(env, jobj, major, minor, "[GSSLibStub_canonicalizeName]");
|
||||
if ((*env)->ExceptionCheck(env)) {
|
||||
return (jlong) GSS_C_NO_NAME;
|
||||
return ptr_to_jlong(GSS_C_NO_NAME);
|
||||
}
|
||||
return ptr_to_jlong(mnNameHdl);
|
||||
}
|
||||
return (jlong) GSS_C_NO_NAME;
|
||||
return ptr_to_jlong(GSS_C_NO_NAME);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user