Skip to content

Commit 8ab2cc8

Browse files
authored
Merge pull request #22817 from pshipton/sipidfix
Fix warnings as errors on Windows 32-bit
2 parents 2ebc54e + 7dad292 commit 8ab2cc8

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

runtime/jcl/common/sigquit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ sigQuitWrapper(struct J9PortLibrary* portLibrary, U_32 gpType, void* gpInfo, voi
159159
if (OMRPORT_SIG_VALUE_32 == infoType) {
160160
rasAsyncPidInfo.siPid = *(U_32 *)infoValue;
161161
} else if (OMRPORT_SIG_VALUE_64 == infoType) {
162-
rasAsyncPidInfo.siPid = *(U_64 *)infoValue;
162+
rasAsyncPidInfo.siPid = (UDATA)*(U_64 *)infoValue;
163163
}
164164
if (0 != rasAsyncPidInfo.siPid) {
165165
/* siPidName needs to be freed after use. */

runtime/jcl/common/sigusr2.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ sigUsr2Wrapper(struct J9PortLibrary *portLibrary, U_32 gpType, void *gpInfo, voi
138138
if (OMRPORT_SIG_VALUE_32 == infoType) {
139139
rasAsyncPidInfo.siPid = *(U_32 *)infoValue;
140140
} else if (OMRPORT_SIG_VALUE_64 == infoType) {
141-
rasAsyncPidInfo.siPid = *(U_64 *)infoValue;
141+
rasAsyncPidInfo.siPid = (UDATA)*(U_64 *)infoValue;
142142
}
143143
if (0 != rasAsyncPidInfo.siPid) {
144144
/* siPidName needs to be freed after use. */

runtime/oti/j9dump.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,12 @@ typedef struct J9RASdumpEventData {
122122
UDATA detailLength;
123123
char* detailData;
124124
j9object_t* exceptionRef;
125-
U_64 siPid;
125+
UDATA siPid;
126126
} J9RASdumpEventData;
127127

128128
typedef struct J9RASAsyncPidInfo {
129129
struct J9JavaVM *vm;
130-
U_64 siPid;
130+
UDATA siPid;
131131
char *siPidName;
132132
} J9RASAsyncPidInfo;
133133

0 commit comments

Comments
 (0)