Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for compile errors seen on OSX #359

Merged
merged 1 commit into from
Oct 17, 2017
Merged

Fixes for compile errors seen on OSX #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion runtime/exelib/common/rconsole.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ remoteConsole_parseCmdLine(J9PortLibrary *portLibrary, UDATA lastLegalArg, char
port = NULL;
filepath = NULL;
for (i = 1; i <= lastLegalArg; i++) {
if ((argv[i][0] == '-')) {
if (argv[i][0] == '-') {
if ((strncmp(&argv[i][1], "IO", 2) == 0) ||
(strncmp(&argv[i][1], "io", 2) == 0)) {

Expand Down
6 changes: 4 additions & 2 deletions runtime/zip/zipcache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,8 @@ BOOLEAN zipCache_copy(J9ZipCache * zipCache, void *cacheData, UDATA dataSize) {

orgDirEntry = &orgzce->root;
/* copy the root file list */
if (record = ZIP_SRP_GET(orgDirEntry->fileList, J9ZipFileRecord *)) {
record = ZIP_SRP_GET(orgDirEntry->fileList, J9ZipFileRecord *);
if (NULL != record) {
while (record) {
J9ZipFileEntry *fileEntry = record->entry;
for (i=0; i<record->entryCount; i++) {
Expand Down Expand Up @@ -830,7 +831,8 @@ J9ZipFileEntry *zipCache_addToFileList(J9PortLibrary *portLib, J9ZipCacheEntry *
char *name;

if (chunkActiveDir == dirEntry) {
if (entry = (J9ZipFileEntry *) zipCache_reserveEntry(zce, chunk, sizeof(*entry), nameSize, &name)) {
entry = (J9ZipFileEntry *) zipCache_reserveEntry(zce, chunk, sizeof(*entry), nameSize, &name);
if (NULL != entry) {
J9ZipFileRecord *fileList = ZIP_SRP_GET(chunkActiveDir->fileList, J9ZipFileRecord *);
/* add to end of existing entry */
fileList->entryCount++;
Expand Down
2 changes: 1 addition & 1 deletion runtime/zip/zipsup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,7 @@ readZipEntry(J9PortLibrary * portLib, J9ZipFile * zipFile, J9ZipEntry * zipEntry
ZIP_NEXT_U32(sig, current);

if (enumerationPointer) {
if ((sig == ZIP_CentralEnd)) {
if (sig == ZIP_CentralEnd) {
result = ZIP_ERR_NO_MORE_ENTRIES;
goto finished;
}
Expand Down