From 75b0f5a5cf16b8076d6f24b2e5a54171474d0471 Mon Sep 17 00:00:00 2001
From: Tony Curtis <anthony.curtis@stonybrook.edu>
Date: Fri, 30 Nov 2018 14:16:42 -0500
Subject: [PATCH 1/2] Move <shmem.h> out of scholl.h, put it directly where
 needed.

This fixes a problem with symbol redef. using PSHMEM interface
---
 src/barrier.c             | 2 ++
 src/reduction.c           | 2 ++
 src/shcoll.h              | 2 +-
 src/util/broadcast-size.c | 1 +
 src/util/scan.c           | 2 ++
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/barrier.c b/src/barrier.c
index 4c273e6..d31619a 100644
--- a/src/barrier.c
+++ b/src/barrier.c
@@ -6,6 +6,8 @@
 #include "util/trees.h"
 #include "util/memfence.h"
 
+#include <shmem.h>
+
 static int tree_degree_barrier = 2;
 static int knomial_tree_radix_barrier = 2;
 
diff --git a/src/reduction.c b/src/reduction.c
index c884131..8a0627e 100644
--- a/src/reduction.c
+++ b/src/reduction.c
@@ -10,6 +10,8 @@
 #include <stdlib.h>
 #include <limits.h>
 
+#include <shmem.h>
+
 /*
  * Local reduce helper
  */
diff --git a/src/shcoll.h b/src/shcoll.h
index d233341..88d1b11 100644
--- a/src/shcoll.h
+++ b/src/shcoll.h
@@ -5,7 +5,7 @@
 #ifndef _SHCOLL_H
 #define _SHCOLL_H 1
 
-#include <shmem.h>
+// #include <shmem.h>
 
 #include <shcoll/common.h>
 // #include <shcoll/compat.h>
diff --git a/src/util/broadcast-size.c b/src/util/broadcast-size.c
index e472945..b833362 100644
--- a/src/util/broadcast-size.c
+++ b/src/util/broadcast-size.c
@@ -6,6 +6,7 @@
 #include "trees.h"
 #include "../shcoll.h"
 
+#include <shmem.h>
 
 const int binomial_tree_radix = 8;
 
diff --git a/src/util/scan.c b/src/util/scan.c
index f12f7bf..a66b24b 100644
--- a/src/util/scan.c
+++ b/src/util/scan.c
@@ -5,6 +5,8 @@
 #include "../shcoll.h"
 #include "scan.h"
 
+#include <shmem.h>
+
 void
 exclusive_prefix_sum(size_t *dest, size_t value, int PE_start, int logPE_stride, int PE_size, long *pSync)
 {

From 060b0d5e3783400010daf650b2fe19ae7d00202c Mon Sep 17 00:00:00 2001
From: Tony Curtis <anthony.curtis@stonybrook.edu>
Date: Fri, 30 Nov 2018 14:32:52 -0500
Subject: [PATCH 2/2] C-style comments on removed shmem header

---
 src/shcoll.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/shcoll.h b/src/shcoll.h
index 88d1b11..6de74b7 100644
--- a/src/shcoll.h
+++ b/src/shcoll.h
@@ -5,10 +5,10 @@
 #ifndef _SHCOLL_H
 #define _SHCOLL_H 1
 
-// #include <shmem.h>
+/* #include <shmem.h> */
 
 #include <shcoll/common.h>
-// #include <shcoll/compat.h>
+/* #include <shcoll/compat.h> */
 
 #include <shcoll/alltoall.h>
 #include <shcoll/alltoalls.h>