8310863: Build failure after JDK- 8305341

Reviewed-by: dholmes
This commit is contained in:
Julian Waters 2023-06-26 05:38:04 +00:00
parent 78c3831701
commit 8242c647b9
3 changed files with 6 additions and 11 deletions

View File

@ -23,7 +23,6 @@
* questions. * questions.
*/ */
#include <stdalign.h>
#include <stdlib.h> #include <stdlib.h>
#include <windows.h> #include <windows.h>
#include "jni.h" #include "jni.h"
@ -50,7 +49,7 @@ Java_java_util_prefs_WindowsPreferences_WindowsRegOpenKey(JNIEnv* env,
int errorCode = RegOpenKeyEx((HKEY) hKey, str, 0, securityMask, &handle); int errorCode = RegOpenKeyEx((HKEY) hKey, str, 0, securityMask, &handle);
(*env)->ReleaseByteArrayElements(env, lpSubKey, str, 0); (*env)->ReleaseByteArrayElements(env, lpSubKey, str, 0);
alignas(8) jlong tmp[2]; _Alignas(8) jlong tmp[2];
tmp[0] = (jlong) handle; tmp[0] = (jlong) handle;
tmp[1] = errorCode; tmp[1] = errorCode;
jlongArray result = (*env)->NewLongArray(env, 2); jlongArray result = (*env)->NewLongArray(env, 2);
@ -79,7 +78,7 @@ Java_java_util_prefs_WindowsPreferences_WindowsRegCreateKeyEx(JNIEnv* env,
NULL, &handle, &lpdwDisposition); NULL, &handle, &lpdwDisposition);
(*env)->ReleaseByteArrayElements(env, lpSubKey, str, 0); (*env)->ReleaseByteArrayElements(env, lpSubKey, str, 0);
alignas(8) jlong tmp[3]; _Alignas(8) jlong tmp[3];
tmp[0] = (jlong) handle; tmp[0] = (jlong) handle;
tmp[1] = errorCode; tmp[1] = errorCode;
tmp[2] = lpdwDisposition; tmp[2] = lpdwDisposition;
@ -197,7 +196,7 @@ Java_java_util_prefs_WindowsPreferences_WindowsRegQueryInfoKey(JNIEnv* env,
&valuesNumber, &maxValueNameLength, &valuesNumber, &maxValueNameLength,
NULL, NULL, NULL); NULL, NULL, NULL);
alignas(8) jlong tmp[5]; _Alignas(8) jlong tmp[5];
tmp[0] = subKeysNumber; tmp[0] = subKeysNumber;
tmp[1] = errorCode; tmp[1] = errorCode;
tmp[2] = valuesNumber; tmp[2] = valuesNumber;

View File

@ -23,8 +23,6 @@
* questions. * questions.
*/ */
#include <stdalign.h>
#include "sun_security_jgss_wrapper_GSSLibStub.h" #include "sun_security_jgss_wrapper_GSSLibStub.h"
#include "NativeUtil.h" #include "NativeUtil.h"
#include "NativeFunc.h" #include "NativeFunc.h"
@ -1191,7 +1189,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_inquireContext(JNIEnv *env,
OM_uint32 flags; OM_uint32 flags;
int isInitiator, isEstablished; int isInitiator, isEstablished;
#if defined (_WIN32) && defined (_MSC_VER) #if defined (_WIN32) && defined (_MSC_VER)
alignas(8) _Alignas(8)
#endif #endif
jlong result[6]; jlong result[6];
jlongArray jresult; jlongArray jresult;

View File

@ -23,8 +23,6 @@
* questions. * questions.
*/ */
#include <stdalign.h>
#include "util.h" #include "util.h"
#include "ArrayReferenceImpl.h" #include "ArrayReferenceImpl.h"
#include "inStream.h" #include "inStream.h"
@ -418,7 +416,7 @@ readLongComponents(JNIEnv *env, PacketInputStream *in,
{ {
int i; int i;
#if defined (_WIN32) && defined (_MSC_VER) #if defined (_WIN32) && defined (_MSC_VER)
alignas(8) _Alignas(8)
#endif #endif
jlong component; jlong component;
@ -449,7 +447,7 @@ readDoubleComponents(JNIEnv *env, PacketInputStream *in,
{ {
int i; int i;
#if defined (_WIN32) && defined (_MSC_VER) #if defined (_WIN32) && defined (_MSC_VER)
alignas(8) _Alignas(8)
#endif #endif
jdouble component; jdouble component;