The Windows protection is called __WINDOWS__ (and it's a mix between WIN32 and _WIN32).
This commit was SVN r8440.
Этот коммит содержится в:
родитель
7baae4f394
Коммит
53235eb34d
@ -54,7 +54,7 @@ void ompi_wait_for_totalview(void)
|
|||||||
&wait_for_totalview);
|
&wait_for_totalview);
|
||||||
if (wait_for_totalview) {
|
if (wait_for_totalview) {
|
||||||
while (MPIR_debug_gate == 0) {
|
while (MPIR_debug_gate == 0) {
|
||||||
#if defined(WIN32)
|
#if defined(__WINDOWS__)
|
||||||
sleep(100); /* milliseconds */
|
sleep(100); /* milliseconds */
|
||||||
#else
|
#else
|
||||||
usleep(100000); /* microseconds */
|
usleep(100000); /* microseconds */
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include "ompi/include/constants.h"
|
#include "ompi/include/constants.h"
|
||||||
#ifdef _WIN32
|
#ifdef __WINDOWS__
|
||||||
#define ompi_socket_errno ompi_get_socket_errno()
|
#define ompi_socket_errno ompi_get_socket_errno()
|
||||||
|
|
||||||
#define EWOULDBLOCK WSAEWOULDBLOCK
|
#define EWOULDBLOCK WSAEWOULDBLOCK
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
#include <sys/select.h>
|
#include <sys/select.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef _WIN32
|
#ifndef __WINDOWS__
|
||||||
/*
|
/*
|
||||||
* Increase FD_SETSIZE
|
* Increase FD_SETSIZE
|
||||||
*/
|
*/
|
||||||
@ -93,7 +93,7 @@ typedef union {
|
|||||||
* handle differences in iovec
|
* handle differences in iovec
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if defined(__APPLE__) || defined(_WIN32)
|
#if defined(__APPLE__) || defined(__WINDOWS__)
|
||||||
typedef char* ompi_iov_base_ptr_t;
|
typedef char* ompi_iov_base_ptr_t;
|
||||||
#else
|
#else
|
||||||
typedef void* ompi_iov_base_ptr_t;
|
typedef void* ompi_iov_base_ptr_t;
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
* statements and the definition of an array of pointers to each
|
* statements and the definition of an array of pointers to each
|
||||||
* component's public mca_base_component_t struct.
|
* component's public mca_base_component_t struct.
|
||||||
*/
|
*/
|
||||||
#ifdef WIN32
|
#ifdef __WINDOWS__
|
||||||
const mca_base_component_t *mca_io_base_static_components[] = {NULL};
|
const mca_base_component_t *mca_io_base_static_components[] = {NULL};
|
||||||
#else
|
#else
|
||||||
#include "ompi/mca/io/base/static-components.h"
|
#include "ompi/mca/io/base/static-components.h"
|
||||||
|
@ -34,7 +34,7 @@
|
|||||||
* component's public mca_base_component_t struct.
|
* component's public mca_base_component_t struct.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef __WINDOWS__
|
||||||
const mca_base_component_t *mca_mpool_base_static_components[] = {NULL};
|
const mca_base_component_t *mca_mpool_base_static_components[] = {NULL};
|
||||||
#else
|
#else
|
||||||
#include "ompi/mca/mpool/base/static-components.h"
|
#include "ompi/mca/mpool/base/static-components.h"
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
* component's public mca_base_component_t struct.
|
* component's public mca_base_component_t struct.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef __WINDOWS__
|
||||||
const mca_base_component_t *mca_rcache_base_static_components[] = {NULL};
|
const mca_base_component_t *mca_rcache_base_static_components[] = {NULL};
|
||||||
#else
|
#else
|
||||||
#include "ompi/mca/rcache/base/static-components.h"
|
#include "ompi/mca/rcache/base/static-components.h"
|
||||||
|
@ -26,7 +26,7 @@ int ompi_mpi_init_io(void)
|
|||||||
int fds[2];
|
int fds[2];
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef __WINDOWS__
|
||||||
/* We need to add a NULL component for iof. Until then, this will have to do */
|
/* We need to add a NULL component for iof. Until then, this will have to do */
|
||||||
/* setup stdin */
|
/* setup stdin */
|
||||||
rc = pipe(fds);
|
rc = pipe(fds);
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user