some oter stupid things i missed out on. changing BOOL to be defined only if we are building the library, not needed otherwise. moving OMPI_DECLSPEC to the top
This commit was SVN r3469.
Этот коммит содержится в:
родитель
a99be29a4a
Коммит
4d4bc1d3ee
@ -13,8 +13,15 @@
|
|||||||
#ifndef OMPI_CONFIG_BOTTOM_H
|
#ifndef OMPI_CONFIG_BOTTOM_H
|
||||||
#define OMPI_CONFIG_BOTTOM_H
|
#define OMPI_CONFIG_BOTTOM_H
|
||||||
|
|
||||||
#if defined(WIN32)
|
#ifdef WIN32
|
||||||
#include "win32/win_compat.h"
|
#include "win32/win_compat.h"
|
||||||
|
#define OMPI_COMP_EXPORT __declspec(dllexport)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(WIN32) && defined(OMPI_BUILDING)
|
||||||
|
#define OMPI_DECLSPEC __declspec(dllexport)
|
||||||
|
#else
|
||||||
|
#define OMPI_DECLSPEC __declspec(dllimport)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef OMPI_DECLSPEC
|
#ifndef OMPI_DECLSPEC
|
||||||
@ -30,7 +37,7 @@
|
|||||||
* constants. OMPI_NEED_C_BOOL will be true if the compiler either
|
* constants. OMPI_NEED_C_BOOL will be true if the compiler either
|
||||||
* needs <stdbool.h> or doesn't define the bool type at all.
|
* needs <stdbool.h> or doesn't define the bool type at all.
|
||||||
*/
|
*/
|
||||||
#ifndef __cplusplus
|
#ifndef __cplusplus && defined(OMPI_BUILDING) && OMPI_BUILDING
|
||||||
# if OMPI_NEED_C_BOOL
|
# if OMPI_NEED_C_BOOL
|
||||||
# if OMPI_USE_STDBOOL_H
|
# if OMPI_USE_STDBOOL_H
|
||||||
/* If we're using <stdbool.h>, there is an implicit
|
/* If we're using <stdbool.h>, there is an implicit
|
||||||
|
@ -19,11 +19,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
|
|
||||||
const mca_base_component_t *mca_coll_base_static_components[] = {NULL};
|
|
||||||
#else
|
|
||||||
#include "mca/coll/base/static-components.h"
|
#include "mca/coll/base/static-components.h"
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user