Looks like this code was intended to separate Sun's vfs struct from everyone else's, yet the #elif can make it fail on some systems that actually support the capability. So just make it an #else to cover the range of systems we now support and move on.
cmr=v1.7.4:reviewer=jsquyres:subject=correct opal_path_df logic This commit was SVN r30172.
Этот коммит содержится в:
родитель
2453843972
Коммит
2b92fccfd1
@ -13,6 +13,7 @@
|
|||||||
* Copyright (c) 2010 IBM Corporation. All rights reserved.
|
* Copyright (c) 2010 IBM Corporation. All rights reserved.
|
||||||
* Copyright (c) 2012-2013 Los Alamos National Security, LLC.
|
* Copyright (c) 2012-2013 Los Alamos National Security, LLC.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
* Copyright (c) 2014 Intel, Inc. All rights reserved.
|
||||||
* $COPYRIGHT$
|
* $COPYRIGHT$
|
||||||
*
|
*
|
||||||
* Additional copyrights may follow
|
* Additional copyrights may follow
|
||||||
@ -524,8 +525,7 @@ opal_path_df(const char *path,
|
|||||||
int err = 0;
|
int err = 0;
|
||||||
#if defined(__SVR4) && defined(__sun)
|
#if defined(__SVR4) && defined(__sun)
|
||||||
struct statvfs buf;
|
struct statvfs buf;
|
||||||
#elif defined(__linux__) || defined (__BSD) || \
|
#else
|
||||||
(defined(__APPLE__) && defined(__MACH__))
|
|
||||||
struct statfs buf;
|
struct statfs buf;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -537,8 +537,7 @@ opal_path_df(const char *path,
|
|||||||
do {
|
do {
|
||||||
#if defined(__SVR4) && defined(__sun)
|
#if defined(__SVR4) && defined(__sun)
|
||||||
rc = statvfs(path, &buf);
|
rc = statvfs(path, &buf);
|
||||||
#elif defined(__linux__) || defined (__BSD) || \
|
#else
|
||||||
(defined(__APPLE__) && defined(__MACH__))
|
|
||||||
rc = statfs(path, &buf);
|
rc = statfs(path, &buf);
|
||||||
#endif
|
#endif
|
||||||
err = errno;
|
err = errno;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user