From f46130cd20914a3c60b19c3b2ed7c4b380319ee9 Mon Sep 17 00:00:00 2001 From: Bert Wesarg Date: Wed, 28 Nov 2018 21:19:44 +0100 Subject: [PATCH] OSHMEM: Let `pshmem.h` include `shmem.h` to be stand-alone again See #6093 Signed-off-by: Bert Wesarg --- oshmem/include/pshmem.h | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/oshmem/include/pshmem.h b/oshmem/include/pshmem.h index f209c18b9b..435097152c 100644 --- a/oshmem/include/pshmem.h +++ b/oshmem/include/pshmem.h @@ -14,32 +14,7 @@ #ifndef PSHMEM_SHMEM_H #define PSHMEM_SHMEM_H - -#include /* include for ptrdiff_t */ -#include /* include for fixed width types */ -#if defined(c_plusplus) || defined(__cplusplus) -# include -# define OSHMEM_COMPLEX_TYPE(type) std::complex -#else -# include -# define OSHMEM_COMPLEX_TYPE(type) type complex -#endif - - -#ifndef OSHMEM_DECLSPEC -# if defined(OPAL_C_HAVE_VISIBILITY) && (OPAL_C_HAVE_VISIBILITY == 1) -# define OSHMEM_DECLSPEC __attribute__((visibility("default"))) -# else -# define OSHMEM_DECLSPEC -# endif -#endif - -#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) -#define OSHMEMP_HAVE_C11 1 -#else -#define OSHMEMP_HAVE_C11 0 -#endif - +#include #include #if defined(c_plusplus) || defined(__cplusplus)