This change allows the trunk to be compiled with Sun
Studio compilers again. It has been broken since 1/14/2009 when some changes exposed a bug in autoconf and how it handles support for the restrict keyword. Basically, Sun Studio C supports the restrict keyword but Sun Studio C++ does not. I am also pursuing a fix with the autoconf folks, but this change was needed to get things building again. This commit was SVN r20351.
Этот коммит содержится в:
родитель
ca0f7d77e9
Коммит
1872a7b75d
@ -9,6 +9,7 @@
|
|||||||
* University of Stuttgart. All rights reserved.
|
* University of Stuttgart. All rights reserved.
|
||||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
* Copyright (c) 2009 Sun Microsystems, Inc. All rights reserved.
|
||||||
* $COPYRIGHT$
|
* $COPYRIGHT$
|
||||||
*
|
*
|
||||||
* Additional copyrights may follow
|
* Additional copyrights may follow
|
||||||
@ -566,4 +567,18 @@ static inline uint16_t ntohs(uint16_t netvar) { return netvar; }
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The following is a workaround for a workaround in autoconf for the
|
||||||
|
* Sun Studio C++ compiler. The Sun Studio C++ compiler does not
|
||||||
|
* support restrict whereas the Sun Studio C compiler does. Initially,
|
||||||
|
* Sun Studio C only supported _Restrict, but later version started
|
||||||
|
* supporting __restrict__ also. Currently, autoconf handles turning
|
||||||
|
* off _Restrict but not __restrict__ for the Sun Studio C++ compiler.
|
||||||
|
* Therefore, we are handling it here. When autoconf gets fixed, this
|
||||||
|
* code can be removed.
|
||||||
|
*/
|
||||||
|
#if defined __SUNPRO_CC && !defined __RESTRICT
|
||||||
|
# define __restrict__
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* OMPI_BUILDING */
|
#endif /* OMPI_BUILDING */
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user