Skip to content
This repository was archived by the owner on Aug 5, 2022. It is now read-only.

A couple of GCC fixes #12

Merged
merged 2 commits into from
Aug 15, 2016
Merged

A couple of GCC fixes #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b6306a
Fix the following errors when building with GCC 6:
ana Jul 29, 2016
87aa2f5
Fix the following problems when building with GCC 6 on i386:
ana Jul 29, 2016
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
3 changes: 2 additions & 1 deletion psm_diags.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,10 +281,11 @@ memcpy_check_size (memcpy_fn_t fn, int *p, int *f, size_t n)
if (USE_MALLOC) {
src = psmi_malloc(PSMI_EP_NONE, UNDEFINED, size);
dst = psmi_malloc(PSMI_EP_NONE, UNDEFINED, size);
if (src == NULL || dst == NULL)
if (src == NULL || dst == NULL) {
if (src) psmi_free(src);
if (dst) psmi_free(dst);
return -1;
}
}
else {
void *src_p = NULL, *dst_p = NULL;
Expand Down
2 changes: 1 addition & 1 deletion ptl_am/am_reqrep_shmem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ psmi_shm_attach(psm_ep_t ep, int *shmidx_o)

ep->amsh_dirpage->is_init = 1;
_IPATH_PRDBG("Mapped and initialized shm object control page at %p,"
"size=%ld, kcopy minor is %d (mode=%s)\n", mapptr,
"size=%zu, kcopy minor is %d (mode=%s)\n", mapptr,
segsz, kcopy_minor,
psmi_kassist_getmode(ep->psmi_kassist_mode));
}
Expand Down