IRIX compile fixes:
- Need to make sure that SIZE_MAX exists as a constant if stdint.h doesn't exist - struct timeval is defined in unistd.h on IRIX, so need to include that headerfile where ever struct timeval is used. This commit was SVN r8361.
Этот коммит содержится в:
родитель
3f891879b0
Коммит
bc4d3d6fff
@ -34,6 +34,7 @@
|
||||
/*
|
||||
* Include what we can and define what is missing.
|
||||
*/
|
||||
#include <limits.h>
|
||||
|
||||
#ifdef HAVE_INTTYPES_H
|
||||
#include <inttypes.h>
|
||||
@ -182,6 +183,18 @@ typedef unsigned long long uintptr_t;
|
||||
|
||||
#endif
|
||||
|
||||
/* fix up some constants that may be missing */
|
||||
#ifndef SIZE_MAX
|
||||
#if SIZEOF_VOID_P == SIZEOF_INT
|
||||
#define SIZE_MAX UINT_MAX
|
||||
#elif SIZEOF_VOID_P == SIZEOF_LONG
|
||||
#define SIZE_MAX ULONG_MAX
|
||||
#else
|
||||
#error Failed to find value for SIZE_MAX
|
||||
#endif
|
||||
|
||||
#endif /* ifndef SIZE_MAX */
|
||||
|
||||
#endif /* HAVE_STDINT_H */
|
||||
|
||||
#endif /* OMPI_STDINT_H */
|
||||
|
@ -17,8 +17,9 @@
|
||||
*/
|
||||
|
||||
#include "orte_config.h"
|
||||
|
||||
#include "orte/include/orte_constants.h"
|
||||
\
|
||||
|
||||
#include "opal/util/output.h"
|
||||
#include "opal/util/trace.h"
|
||||
|
||||
|
@ -25,6 +25,10 @@
|
||||
|
||||
#include "orte_config.h"
|
||||
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include "dps/dps_types.h"
|
||||
#include "mca/mca.h"
|
||||
#include "mca/ns/ns_types.h"
|
||||
|
@ -24,6 +24,9 @@
|
||||
#ifdef HAVE_NETINET_IN_H
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include "include/constants.h"
|
||||
#include "opal/util/argv.h"
|
||||
|
@ -25,6 +25,10 @@
|
||||
|
||||
#include "ompi_config.h"
|
||||
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include "include/types.h"
|
||||
#include "mca/mca.h"
|
||||
|
||||
|
@ -24,6 +24,11 @@
|
||||
#define ORTE_RML_H_
|
||||
|
||||
#include "orte_config.h"
|
||||
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#include "include/orte_constants.h"
|
||||
|
||||
#include "mca/mca.h"
|
||||
|
Загрузка…
Ссылка в новой задаче
Block a user