Skip to content

Commit a3e4c33

Browse files
authored
Merge pull request #2524 from jladd-mlnx/topic/shmemx_h-master
Remove shmemx.h from shmem.h. Add shmem.h to shmemx.h
2 parents 59f40e7 + dc6f4a0 commit a3e4c33

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

oshmem/include/shmem.h.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
#endif
4949

5050
#include <shmem-compat.h>
51-
#include <shmemx.h>
5251

5352
#if defined(c_plusplus) || defined(__cplusplus)
5453
extern "C" {

oshmem/include/shmemx.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#ifndef OSHMEM_SHMEMX_H
1313
#define OSHMEM_SHMEMX_H
1414

15+
#include <shmem.h>
16+
1517
#if defined(c_plusplus) || defined(__cplusplus)
1618
extern "C" {
1719
#endif

0 commit comments

Comments
 (0)