From b4effd200fde5bae95126c13062c05f706ede59a Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Tue, 11 Feb 2014 01:36:26 +0000
Subject: [PATCH] Remove num_pes,my_pe declarations from shmem.fh.

The openshmem test suite
(http://bongo.cs.uh.edu/site/sites/default/site_files/openshmem-test-suite-release-1.0d.tar.bz2)
declares num_pes and my_pe in each Fortran test file -- it apparently
doesn't expect shmem.fh to declare these functions.  Sigh.

cmr=v1.7.5:reviewer=miked:subject=the openshmem community is crazy

This commit was SVN r30660.
---
 examples/hello_oshmemfh.f90 | 2 ++
 examples/ring_oshmemfh.f90  | 2 ++
 oshmem/include/shmem.fh     | 4 +---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/examples/hello_oshmemfh.f90 b/examples/hello_oshmemfh.f90
index 23f696acf2..20c7d834d0 100644
--- a/examples/hello_oshmemfh.f90
+++ b/examples/hello_oshmemfh.f90
@@ -1,6 +1,7 @@
 !
 ! Copyright (c) 2013      Mellanox Technologies, Inc.
 !                         All rights reserved.
+! Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
 ! $COPYRIGHT$
 !
 ! Additional copyrights may follow
@@ -12,6 +13,7 @@ program hello_oshmem
     include 'shmem.fh'
 
     integer proc, nproc
+    integer my_pe, num_pes
 
     call START_PES(0)
     proc = MY_PE()
diff --git a/examples/ring_oshmemfh.f90 b/examples/ring_oshmemfh.f90
index 9b4359666b..7a90357348 100644
--- a/examples/ring_oshmemfh.f90
+++ b/examples/ring_oshmemfh.f90
@@ -1,6 +1,7 @@
 !
 ! Copyright (c) 2013      Mellanox Technologies, Inc.
 !                         All rights reserved.
+! Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
 ! $COPYRIGHT$
 !
 ! Additional copyrights may follow
@@ -15,6 +16,7 @@ program ring_oshmem
     integer*8, save   :: rbuf
     integer*8         :: message
     integer           :: proc, nproc, next
+    integer           :: my_pe, num_pes
 
     rbuf = -1
     message = 10
diff --git a/oshmem/include/shmem.fh b/oshmem/include/shmem.fh
index 8ce272a6f3..87a6afb38d 100644
--- a/oshmem/include/shmem.fh
+++ b/oshmem/include/shmem.fh
@@ -2,6 +2,7 @@
 !
 !   Copyright (c) 2013      Mellanox Technologies, Inc.
 !                           All rights reserved.
+!   Copyright (c) 2014 Cisco Systems, Inc.  All rights reserved.
 !   $COPYRIGHT$
 !
 !   Additional copyrights may follow
@@ -48,9 +49,6 @@
       integer SHMEM_CMP_GE
       parameter ( SHMEM_CMP_GE = 5 )
 
-      integer my_pe
-      integer num_pes
-
       logical shmem_pe_accessible
       logical shmem_addr_accessible