Skip to content

Commit 8242c64

Browse files
committedJun 26, 2023
8310863: Build failure after JDK- 8305341
Reviewed-by: dholmes
1 parent 78c3831 commit 8242c64

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed
 

‎src/java.prefs/windows/native/libprefs/WindowsPreferences.c

+3-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
* questions.
2424
*/
2525

26-
#include <stdalign.h>
2726
#include <stdlib.h>
2827
#include <windows.h>
2928
#include "jni.h"
@@ -50,7 +49,7 @@ Java_java_util_prefs_WindowsPreferences_WindowsRegOpenKey(JNIEnv* env,
5049
int errorCode = RegOpenKeyEx((HKEY) hKey, str, 0, securityMask, &handle);
5150
(*env)->ReleaseByteArrayElements(env, lpSubKey, str, 0);
5251

53-
alignas(8) jlong tmp[2];
52+
_Alignas(8) jlong tmp[2];
5453
tmp[0] = (jlong) handle;
5554
tmp[1] = errorCode;
5655
jlongArray result = (*env)->NewLongArray(env, 2);
@@ -79,7 +78,7 @@ Java_java_util_prefs_WindowsPreferences_WindowsRegCreateKeyEx(JNIEnv* env,
7978
NULL, &handle, &lpdwDisposition);
8079
(*env)->ReleaseByteArrayElements(env, lpSubKey, str, 0);
8180

82-
alignas(8) jlong tmp[3];
81+
_Alignas(8) jlong tmp[3];
8382
tmp[0] = (jlong) handle;
8483
tmp[1] = errorCode;
8584
tmp[2] = lpdwDisposition;
@@ -197,7 +196,7 @@ Java_java_util_prefs_WindowsPreferences_WindowsRegQueryInfoKey(JNIEnv* env,
197196
&valuesNumber, &maxValueNameLength,
198197
NULL, NULL, NULL);
199198

200-
alignas(8) jlong tmp[5];
199+
_Alignas(8) jlong tmp[5];
201200
tmp[0] = subKeysNumber;
202201
tmp[1] = errorCode;
203202
tmp[2] = valuesNumber;

‎src/java.security.jgss/share/native/libj2gss/GSSLibStub.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
* questions.
2424
*/
2525

26-
#include <stdalign.h>
27-
2826
#include "sun_security_jgss_wrapper_GSSLibStub.h"
2927
#include "NativeUtil.h"
3028
#include "NativeFunc.h"
@@ -1191,7 +1189,7 @@ Java_sun_security_jgss_wrapper_GSSLibStub_inquireContext(JNIEnv *env,
11911189
OM_uint32 flags;
11921190
int isInitiator, isEstablished;
11931191
#if defined (_WIN32) && defined (_MSC_VER)
1194-
alignas(8)
1192+
_Alignas(8)
11951193
#endif
11961194
jlong result[6];
11971195
jlongArray jresult;

‎src/jdk.jdwp.agent/share/native/libjdwp/ArrayReferenceImpl.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
* questions.
2424
*/
2525

26-
#include <stdalign.h>
27-
2826
#include "util.h"
2927
#include "ArrayReferenceImpl.h"
3028
#include "inStream.h"
@@ -418,7 +416,7 @@ readLongComponents(JNIEnv *env, PacketInputStream *in,
418416
{
419417
int i;
420418
#if defined (_WIN32) && defined (_MSC_VER)
421-
alignas(8)
419+
_Alignas(8)
422420
#endif
423421
jlong component;
424422

@@ -449,7 +447,7 @@ readDoubleComponents(JNIEnv *env, PacketInputStream *in,
449447
{
450448
int i;
451449
#if defined (_WIN32) && defined (_MSC_VER)
452-
alignas(8)
450+
_Alignas(8)
453451
#endif
454452
jdouble component;
455453

0 commit comments

Comments
 (0)
Please sign in to comment.