1
1

Remove CFLAGS setting that was really only intended for the v1.6

branch (it's not necessary on trunk/v1.7 because they require C99,
which allows variadic macros).

Also fix another compiler warning (using %p to print a (void*)).

Submitted by Jeff, reviewed by Dave.

cmr=v1.7.4:reviewer=ompi-rm1.7:subject=two usnic BTL fixes

This commit was SVN r29966.
Этот коммит содержится в:
Jeff Squyres 2013-12-19 00:19:05 +00:00
родитель b9765a380f
Коммит bb59b07321
2 изменённых файлов: 1 добавлений и 6 удалений

Просмотреть файл

@ -1447,7 +1447,7 @@ static int usnic_dereg_mr(void* reg_data,
if (ud_reg->mr != NULL) {
if (ibv_dereg_mr(ud_reg->mr)) {
opal_output(0, "%s: error unpinning UD memory mr=%p: %s\n",
__func__, ud_reg->mr, strerror(errno));
__func__, (void*) ud_reg->mr, strerror(errno));
return OMPI_ERROR;
}
}

Просмотреть файл

@ -65,11 +65,6 @@ AC_DEFUN([MCA_ompi_btl_usnic_CONFIG],[
[$btl_usnic_have_ibv_event_gid_change],
[Whether we have IBV_EVENT_GID_CHANGE or not])
# In the v1.6 branch with --enable-picky we end up with warnings about
# otherwise fairly portable __VA_ARGS__ usage. Suppress that here (just
# for the usnic BTL).
btl_usnic_CFLAGS="-Wno-variadic-macros"
AS_IF([test "$btl_usnic_happy" = "yes"],
[btl_usnic_WRAPPER_EXTRA_LDFLAGS="$btl_usnic_LDFLAGS"
btl_usnic_WRAPPER_EXTRA_LIBS="$btl_usnic_LIBS"