Remove the definition of _WIN32_DCOM. It only enables DCOM when _WIN32_WINNT is less then 0x400 (Win 95, 98), and we are supporting 0x502(Win XP) and above in Open MPI. Thanks George for pointing this out.
This commit was SVN r21555.
Этот коммит содержится в:
родитель
5b13fd004a
Коммит
656ec00611
43
config/opal_check_offsetof.m4
Обычный файл
43
config/opal_check_offsetof.m4
Обычный файл
@ -0,0 +1,43 @@
|
||||
# -*- shell-script -*-
|
||||
#
|
||||
# Copyright (c) 2009 IBM Corporation. All rights reserved.
|
||||
# Copyright (c) 2009 Cisco Systems, Inc. All rights reserved.
|
||||
# $COPYRIGHT$
|
||||
#
|
||||
# Additional copyrights may follow
|
||||
#
|
||||
# $HEADER$
|
||||
#
|
||||
|
||||
# This macro checks to ensure that the compiler properly supports
|
||||
# offsetof(). The PGI compilers had a problem with this macro in some
|
||||
# versions of their compiler on some platforms (e.g., 9.0-1 on
|
||||
# x86_64). The workaround is to use -DNO_PGI_OFFSET in these cases.
|
||||
# A bug report was submitted to PGI support in late June 2009; the
|
||||
# problem was apparently a trivial typo in one of their header files
|
||||
# and should be fixed in subsequent releases (e.g., 9.0-2?).
|
||||
|
||||
AC_DEFUN([OPAL_CHECK_OFFSETOF],[
|
||||
OMPI_VAR_SCOPE_PUSH([have_offsetof_msg])
|
||||
|
||||
AC_MSG_CHECKING(for functional offsetof macro)
|
||||
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include<stddef.h>]],
|
||||
[[struct foo {int a, b;}; size_t offset = offsetof(struct foo, b); ]]),
|
||||
[have_offsetof_msg="yes"], [have_offsetof_msg="no"])
|
||||
if test "$have_offsetof_msg" = "no"; then
|
||||
CPPFLAGS="$CPPFLAGS -DNO_PGI_OFFSET"
|
||||
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include<stddef.h>]],
|
||||
[[struct foo {int a, b;}; size_t offset = offsetof(struct foo, b); ]]),
|
||||
[have_offsetof_msg="yes"], [have_offsetof_msg="no"])
|
||||
|
||||
if test "$have_offsetof_msg" = "no"; then
|
||||
AC_MSG_RESULT([$have_offsetof_msg])
|
||||
AC_MSG_WARN([Your compiler does not support offsetof macro])
|
||||
AC_MSG_ERROR([Configure: Cannot continue])
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_MSG_RESULT([$have_offsetof_msg])
|
||||
OMPI_VAR_SCOPE_POP
|
||||
])dnl
|
||||
|
@ -359,6 +359,10 @@ else
|
||||
OMPI_PROFILING_COMPILE_SEPARATELY=0
|
||||
fi
|
||||
|
||||
# Check if we support the offsetof compiler directive
|
||||
|
||||
OPAL_CHECK_OFFSETOF
|
||||
|
||||
#
|
||||
# There are 2 layers to the MPI Language binidings One layer generates
|
||||
# MPI_* bindings. The other layer generates PMPI_* bindings. The
|
||||
|
@ -14,8 +14,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#define _WIN32_DCOM
|
||||
|
||||
#include "orte_config.h"
|
||||
|
||||
#include "opal/mca/base/mca_base_param.h"
|
||||
|
@ -12,8 +12,6 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#define _WIN32_DCOM
|
||||
|
||||
#include "orte_config.h"
|
||||
#include "orte/constants.h"
|
||||
#include "orte/types.h"
|
||||
|
@ -26,8 +26,6 @@
|
||||
*/
|
||||
|
||||
|
||||
#define _WIN32_DCOM
|
||||
|
||||
#include "orte_config.h"
|
||||
#include "orte/constants.h"
|
||||
|
||||
|
@ -2,7 +2,7 @@
|
||||
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
||||
* of Tennessee Research Foundation. All rights
|
||||
* reserved.
|
||||
* Copyright (c) 2004-2008 High Performance Computing Center Stuttgart,
|
||||
* Copyright (c) 2004-2009 High Performance Computing Center Stuttgart,
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2008 The Trustees of Indiana University.
|
||||
* All rights reserved.
|
||||
@ -13,7 +13,6 @@
|
||||
* $HEADER$
|
||||
*/
|
||||
|
||||
#define _WIN32_DCOM
|
||||
|
||||
#include "orte_config.h"
|
||||
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user