Changes to further OSX compilation #738
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DanHeidinga
requested changes
Dec 1, 2017
runtime/port/sysvipc/j9shmem.c
Outdated
| #if defined (__GNUC__) || defined (AIXPPC) | ||
| #if defined (__GNUC__) | ||
| #if defined(__GNUC__) || defined(AIXPPC) | ||
| #if defined(__GNUC__) && !defined(OSX) |
There was a problem hiding this comment.
Can this be written as:
#if defined(OSX)
/*Use ._key for OSX*/
+ if (buf.shm_perm._key != controlinfo->common.ftok_key)
#elif defined(__GNUC__)
/*Use .__key for __GNUC__*/
if (buf.shm_perm.__key != controlinfo->common.ftok_key)
#elif defined(AIXPPC)
......
#endif
| #if defined (__GNUC__) || defined (AIXPPC) || defined(J9ZTPF) | ||
| #if defined (__GNUC__) && !defined(J9ZTPF) | ||
| #if defined(__GNUC__) || defined(AIXPPC) || defined(J9ZTPF) | ||
| #if defined(__GNUC__) && !defined(J9ZTPF) && !defined(OSX) |
There was a problem hiding this comment.
Can a similar refactoring as suggested above be done here as well?
jdekonin
force-pushed
the
cast
branch
2 times, most recently
from
573fdbd to
e798041
Compare
|
Refactoring performed. |
DanHeidinga
reviewed
Dec 5, 2017
| /*Use .key for AIXPPC*/ | ||
| if (buf.sem_perm.key != controlinfo->ftok_key) | ||
| #endif | ||
| #if defined(J9ZTPF) | ||
| #elif defined(J9ZTPF) | ||
| /*Use .key for z/TPF */ |
There was a problem hiding this comment.
Can you fix the comment spacing here since the files being modified anyway?
There was a problem hiding this comment.
Fixed, sorry I should've caught that.
|
@jdekonin Change looks good to me and I'll launch builds on it after the minor comment indenting issue is fixed |
Signed-off-by: Joe deKoning <[email protected]>
Signed-off-by: Joe deKoning <[email protected]>
|
Jenkins test sanity plinux |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The changes to j9porterror.h were originally from @DanHeidinga that I took over as per his agreement in #36. It needed a minor modification to compile on windows, an (I_32) addition.