Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Final Windows fixes. ihse-jdk-library-branch
authorihse
Fri, 20 Apr 2018 09:23:09 +0200
branchihse-jdk-library-branch
changeset 56466 4de0b680c1cd
parent 56465 811810e6925d
child 56467 0d2a92ed27e9
Final Windows fixes.
make/lib/Lib-java.security.jgss.gmk file | annotate | diff | comparison | revisions
make/lib/Lib-jdk.crypto.mscapi.gmk file | annotate | diff | comparison | revisions
src/java.security.jgss/windows/native/libw2k_lsa_auth/NativeCreds.c file | annotate | diff | comparison | revisions
src/java.security.jgss/windows/native/libw2k_lsa_auth/WindowsDirectory.c file | annotate | diff | comparison | revisions
src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp file | annotate | diff | comparison | revisions 
--- a/make/lib/Lib-java.security.jgss.gmk	Thu Apr 19 21:21:45 2018 +0200
+++ b/make/lib/Lib-java.security.jgss.gmk	Fri Apr 20 09:23:09 2018 +0200
@@ -50,7 +50,7 @@
         OPTIMIZATION := LOW, \
         CFLAGS := $(CFLAGS_JDKLIB), \
         HEADER_FLAGS := \
-            -I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \
+            -I$(call FindHeaderDirForModule, $(MODULE)), \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN), \
         LIBS := advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \
--- a/make/lib/Lib-jdk.crypto.mscapi.gmk	Thu Apr 19 21:21:45 2018 +0200
+++ b/make/lib/Lib-jdk.crypto.mscapi.gmk	Fri Apr 20 09:23:09 2018 +0200
@@ -29,11 +29,12 @@
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
 
-#FIXME:LIBS severly broken includes!
   $(eval $(call SetupJdkLibrary, BUILD_LIBSUNMSCAPI, \
       NAME := sunmscapi, \
       OPTIMIZATION := LOW, \
       CXXFLAGS := $(CXXFLAGS_JDKLIB), \
+      HEADER_FLAGS := \
+          -I$(call FindHeaderDirForModule, $(MODULE)), \
       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := crypt32.lib advapi32.lib, \
--- a/src/java.security.jgss/windows/native/libw2k_lsa_auth/NativeCreds.c	Thu Apr 19 21:21:45 2018 +0200
+++ b/src/java.security.jgss/windows/native/libw2k_lsa_auth/NativeCreds.c	Fri Apr 20 09:23:09 2018 +0200
@@ -44,6 +44,7 @@
 #include <jni.h>
 #include "jni_util.h"
 #include <winsock.h>
+#include "sun_security_krb5_Credentials.h"
 
 #undef LSA_SUCCESS
 #define LSA_SUCCESS(Status) ((Status) >= 0)
--- a/src/java.security.jgss/windows/native/libw2k_lsa_auth/WindowsDirectory.c	Thu Apr 19 21:21:45 2018 +0200
+++ b/src/java.security.jgss/windows/native/libw2k_lsa_auth/WindowsDirectory.c	Fri Apr 20 09:23:09 2018 +0200
@@ -27,6 +27,7 @@
 #include <jni.h>
 #include <windows.h>
 #include <stdlib.h>
+#include "sun_security_krb5_Config.h"
 
 /*
  * Class:     sun_security_krb5_Config
--- a/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp	Thu Apr 19 21:21:45 2018 +0200
+++ b/src/jdk.crypto.mscapi/windows/native/libsunmscapi/security.cpp	Fri Apr 20 09:23:09 2018 +0200
@@ -37,7 +37,7 @@
 #include <wincrypt.h>
 #include <stdio.h>
 #include <memory>
-
+#include "sun_security_mscapi_PRNG.h"
 
 #define OID_EKU_ANY         "2.5.29.37.0"
jdk-sandbox