- Replace combinations of

#if defined (c_plusplus)
          defined (__cplusplus)
   followed by
      extern "C" {
   and the closing counterpart by BEGIN_C_DECLS and END_C_DECLS.

   Notable exceptions are:
    - opal/include/opal_config_bottom.h:
      This is our generated code, that itself defines BEGIN_C_DECL and
      END_C_DECL
    - ompi/mpi/cxx/mpicxx.h:
      Here we do not include opal_config_bottom.h:                                 
    - Belongs to external code:                                                    
      opal/mca/backtrace/darwin/MoreBacktrace/MoreDebugging/MoreBacktrace.c        
      opal/mca/backtrace/darwin/MoreBacktrace/MoreDebugging/MoreBacktrace.h        
    - opal/include/opal/prefetch.h:
      Has C++ specific macros that are protected:                                  

    - Had #if ... } #endif  _and_ END_C_DECLS (aka end up with 2x
      END_C_DECLS)
      ompi/mca/btl/openib/btl_openib.h
    - opal/event/event.h has #ifdef __cplusplus as BEGIN_C_DECLS...
    - opal/win32/ompi_process.h: had extern "C"\n {...
      opal/win32/ompi_process.h: dito
    - ompi/mca/btl/pcie/btl_pcie_lex.l: needed to add *_C_DECLS
      ompi/mpi/f90/test/align_c.c: dito
    - ompi/debuggers/msgq_interface.h: used #ifdef __cplusplus
    - ompi/mpi/f90/xml/common-C.xsl: Amend

   Tested on linux using --with-openib and --with-mx

   The following do not contain either opal_config.h, orte_config.h or
   ompi_config.h
   (but possibly other header files, that include one of the above):
      ompi/mca/bml/r2/bml_r2_ft.h
      ompi/mca/btl/gm/btl_gm_endpoint.h
      ompi/mca/btl/gm/btl_gm_proc.h
      ompi/mca/btl/mx/btl_mx_endpoint.h
      ompi/mca/btl/ofud/btl_ofud_endpoint.h
      ompi/mca/btl/ofud/btl_ofud_frag.h
      ompi/mca/btl/ofud/btl_ofud_proc.h
      ompi/mca/btl/openib/btl_openib_mca.h
      ompi/mca/btl/portals/btl_portals_endpoint.h
      ompi/mca/btl/portals/btl_portals_frag.h
      ompi/mca/btl/sctp/btl_sctp_endpoint.h
      ompi/mca/btl/sctp/btl_sctp_proc.h
      ompi/mca/btl/tcp/btl_tcp_endpoint.h
      ompi/mca/btl/tcp/btl_tcp_ft.h
      ompi/mca/btl/tcp/btl_tcp_proc.h
      ompi/mca/btl/template/btl_template_endpoint.h
      ompi/mca/btl/template/btl_template_proc.h
      ompi/mca/btl/udapl/btl_udapl_eager_rdma.h
      ompi/mca/btl/udapl/btl_udapl_endpoint.h
      ompi/mca/btl/udapl/btl_udapl_mca.h
      ompi/mca/btl/udapl/btl_udapl_proc.h
      ompi/mca/mtl/mx/mtl_mx_endpoint.h
      ompi/mca/mtl/mx/mtl_mx.h
      ompi/mca/mtl/psm/mtl_psm_endpoint.h
      ompi/mca/mtl/psm/mtl_psm.h
      ompi/mca/pml/cm/pml_cm_component.h
      ompi/mca/pml/csum/pml_csum_comm.h
      ompi/mca/pml/dr/pml_dr_comm.h
      ompi/mca/pml/dr/pml_dr_component.h
      ompi/mca/pml/dr/pml_dr_endpoint.h
      ompi/mca/pml/dr/pml_dr_recvfrag.h
      ompi/mca/pml/example/pml_example.h
      ompi/mca/pml/ob1/pml_ob1_comm.h
      ompi/mca/pml/ob1/pml_ob1_component.h
      ompi/mca/pml/ob1/pml_ob1_endpoint.h
      ompi/mca/pml/ob1/pml_ob1_rdmafrag.h
      ompi/mca/pml/ob1/pml_ob1_recvfrag.h
      ompi/mca/pml/v/pml_v_output.h
      opal/include/opal/prefetch.h
      opal/mca/timer/aix/timer_aix.h
      opal/util/qsort.h
      test/support/components.h

This commit was SVN r21855.

The following SVN revision numbers were found above:
  r2 --> open-mpi/ompi@58fdc18855

contrib/ompi_cplusplus.sed

@@ -0,0 +1,41 @@
+#
+# Best attempt at a sed script to remove (almost) all combinations
+# of C++ namespace occurences: While std. 3-line occurences with any
+# combination of spaces and ordering of [c_plusplus,__cplusplus] can
+# be detected, sed does not allow multi-line (here >3 lines) parsing.
+# This all depends on the number of "N" the macro swallows.
+#
+
+# C_PLUSPLUS || __CPLUSPLUS
+/#if *defined *(c_plusplus) *|| *defined *(__cplusplus)/{
+N
+N
+s/\#if *defined *(c_plusplus) *|| *defined *(__cplusplus) *\n}\n#endif */END_C_DECLS/
+s/\#if *defined *(c_plusplus) *|| *defined *(__cplusplus) *\n *extern *"C" *{ *\n\#endif */BEGIN_C_DECLS/
+}
+
+
+# __CPLUSPLUS || C_PLUSPLUS
+/#if *defined *(__cplusplus) *|| *defined *(c_plusplus)/{
+N
+N
+s/\#if *defined *(__cplusplus) *|| *defined *(c_plusplus) *\n}\n#endif */END_C_DECLS/
+s/\#if *defined *(__cplusplus) *|| *defined *(c_plusplus) *\n *extern *"C" *{ *\n\#endif */BEGIN_C_DECLS/
+}
+
+# C_PLUSPLUS
+/#if *defined *(c_plusplus)/{
+N
+N
+s/\#if *defined *(c_plusplus) *\n}\n#endif */END_C_DECLS/
+s/\#if *defined *(c_plusplus) *\n *extern *"C" *{ *\n\#endif *\n/BEGIN_C_DECLS/
+}
+
+# __CPLUSPLUS
+/#if *defined *(__cplusplus)/{
+N
+N
+s/\#if *defined *(__cplusplus) *\n}\n#endif */END_C_DECLS/
+s/\#if *defined *(__cplusplus) *\n *extern *"C" *{ *\n\#endif */BEGIN_C_DECLS/
+}
+

contrib/ompi_cplusplus.sh

@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# Change all occurences of #if defined(c_plusplus) and variations
+# to BEGIN_C_DECLS and END_C_DECLS using sed.
+#
+# List of files grepped are in XXX, sed script is in XXX
+#
+TMPDIR=${TMPDIR:-.}
+
+while read LINE  ; do
+  if test '#' = ${LINE:0:1} ; then
+    continue
+  fi
+
+  FILE=${LINE%%:*}
+  HAS_OPAL_CONFIG_H=0
+  HAS_ORTE_CONFIG_H=0
+  HAS_OMPI_CONFIG_H=0
+  grep -q "#include \"opal_config.h\"" $FILE && HAS_OPAL_CONFIG_H=1
+  grep -q "#include \"orte_config.h\"" $FILE && HAS_ORTE_CONFIG_H=1
+  grep -q "#include \"ompi_config.h\"" $FILE && HAS_OMPI_CONFIG_H=1
+
+  if test $HAS_OPAL_CONFIG_H -eq 0 -a \
+          $HAS_ORTE_CONFIG_H -eq 0 -a \
+          $HAS_OMPI_CONFIG_H -eq 0 ; then
+    echo $FILE contains neither header
+  fi
+  sed -f contrib/ompi_cplusplus.sed $FILE > $TMPDIR/tmp_file.tmp
+  mv $TMPDIR/tmp_file.tmp $FILE
+
+
+  #
+  # Sanity check
+  #
+  # grep -h -c BEGIN_C_DECLS $FILE | grep -v ':1$'
+  # grep -h -c END_C_DECLS $FILE | grep -v ':1$'
+done < contrib/ompi_cplusplus.txt

contrib/ompi_cplusplus.txt

@@ -0,0 +1,186 @@
+# The two following belong to a different package
+#### ./opal/mca/backtrace/darwin/MoreBacktrace/MoreDebugging/MoreBacktrace.c: defined(__cplusplus)
+#### ./opal/mca/backtrace/darwin/MoreBacktrace/MoreDebugging/MoreBacktrace.h: defined(__cplusplus)
+# This is our generated code, that itself defines BEGIN_C_DECL and END_C_DECL
+#### ./opal/include/opal_config_bottom.h: (defined(c_plusplus)  defined(__cplusplus))
+# Here we cannot include opal_config_bottom.h
+#### ./ompi/mpi/cxx/mpicxx.h: defined(__cplusplus)  defined(c_plusplus)
+# These are external:
+#### ./opal/mca/memory/ptmalloc2/
+#### ./opal/mca/paffinity/linux/plpa/
+#### ./ompi/include/mpi_portable_platform.h.in
+#### ./ompi/mca/io/romio/
+./ompi/mca/topo/unity/topo_unity.h: defined(__cplusplus)  defined(c_plusplus)
+./opal/win32/ompi_process.h: defined(c_plusplus)  defined (__cplusplus)
+./opal/win32/ompi_time.h: defined(c_plusplus)  defined (__cplusplus)
+./opal/win32/ompi_uio.h: defined(c_plusplus)  defined (__cplusplus)
+./ompi/class/ompi_free_list.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/class/ompi_rb_tree.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/class/ompi_seq_tracker.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/group/group.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/allocator/base/base.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/allocator/basic/allocator_basic.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/allocator/bucket/allocator_bucket_alloc.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/bml/base/base.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/bml/base/bml_base_btl.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/bml/r2/bml_r2_ft.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/bml/r2/bml_r2.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/gm/btl_gm_endpoint.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/gm/btl_gm_frag.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/gm/btl_gm.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/gm/btl_gm_proc.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/mx/btl_mx_endpoint.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/ofud/btl_ofud_endpoint.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/ofud/btl_ofud_frag.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/ofud/btl_ofud.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/ofud/btl_ofud_proc.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/openib/btl_openib_eager_rdma.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/openib/btl_openib_frag.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/openib/btl_openib.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/openib/btl_openib_lex.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/openib/btl_openib_mca.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/portals/btl_portals_endpoint.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/portals/btl_portals_frag.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/sctp/btl_sctp_endpoint.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/sctp/btl_sctp_frag.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/sctp/btl_sctp.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/sctp/btl_sctp_hdr.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/sctp/btl_sctp_proc.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/self/btl_self.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/sm/btl_sm.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/tcp/btl_tcp_endpoint.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/tcp/btl_tcp_frag.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/tcp/btl_tcp_ft.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/tcp/btl_tcp.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/tcp/btl_tcp_proc.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/template/btl_template_endpoint.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/template/btl_template_frag.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/template/btl_template.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/template/btl_template_proc.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/udapl/btl_udapl_eager_rdma.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/udapl/btl_udapl_endpoint.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/udapl/btl_udapl_frag.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/udapl/btl_udapl.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/udapl/btl_udapl_mca.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/btl/udapl/btl_udapl_proc.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/coll/tuned/coll_tuned_dynamic_file.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/coll/tuned/coll_tuned_dynamic_rules.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/coll/tuned/coll_tuned.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/coll/tuned/coll_tuned_topo.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/coll/tuned/coll_tuned_util.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/common/sm/common_sm_mmap.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/crcp/base/base.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/crcp/bkmrk/crcp_bkmrk.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/crcp/crcp.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/io/base/base.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/io/base/io_base_request.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/io/romio/src/io_romio.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/mpool/base/mpool_base_mem_cb.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/mpool/fake/mpool_fake.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/mpool/rdma/mpool_rdma.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/mpool/sm/mpool_sm.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/mtl/base/base.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/mtl/mtl.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/mtl/mx/mtl_mx_endpoint.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/mtl/mx/mtl_mx.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/mtl/mx/mtl_mx_types.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/mtl/portals/mtl_portals.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/mtl/psm/mtl_psm_endpoint.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/mtl/psm/mtl_psm.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/mtl/psm/mtl_psm_types.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/cm/pml_cm_component.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/crcpw/pml_crcpw.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/csum/pml_csum_comm.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/dr/pml_dr_comm.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/dr/pml_dr_component.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/dr/pml_dr_endpoint.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/dr/pml_dr.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/dr/pml_dr_recvfrag.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/dr/pml_dr_recvreq.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/dr/pml_dr_sendreq.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/dr/pml_dr_vfrag.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/example/pml_example.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/ob1/pml_ob1_comm.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/ob1/pml_ob1_component.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/ob1/pml_ob1_endpoint.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/ob1/pml_ob1_rdmafrag.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/ob1/pml_ob1_recvfrag.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/pml.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/v/mca/vprotocol/base/base.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/v/mca/vprotocol/base/vprotocol_base_request.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/v/mca/vprotocol/vprotocol.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/pml/v/pml_v_output.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mca/rcache/base/base.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/mpi/f77/f77_strings.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/request/grequest.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/runtime/ompi_cr.h: defined(c_plusplus)  defined(__cplusplus)
+./ompi/win/win.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/event/event.h: defined(c_plusplus)  defined(__cplusplus)
+# Has C++ specific macros that are protected:
+####./opal/include/opal/prefetch.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/include/opal/sys/atomic.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/include/opal/sys/timer.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/backtrace/backtrace.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/backtrace/base/base.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/backtrace/none/backtrace_none_component.c: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/base/mca_base_component_repository.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/base/mca_base_param.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/base/mca_base_param_internal.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/crs/base/base.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/crs/blcr/crs_blcr.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/crs/crs.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/crs/none/crs_none.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/crs/self/crs_self.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/installdirs/base/base.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/installdirs/installdirs.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/maffinity/first_use/maffinity_first_use.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/maffinity/libnuma/maffinity_libnuma.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/memchecker/base/base.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/memchecker/valgrind/memchecker_valgrind.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/memcpy/base/base.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/memory/base/base.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/paffinity/linux/paffinity_linux.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/paffinity/solaris/paffinity_solaris.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/paffinity/windows/paffinity_windows.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/timer/aix/timer_aix.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/timer/base/base.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/timer/windows/timer_windows_component.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/mca/timer/windows/timer_windows.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/memoryhooks/memory.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/memoryhooks/memory_internal.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/runtime/opal_cr.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/runtime/opal_progress.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/threads/threads.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/util/cmd_line.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/util/crc.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/util/daemon_init.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/util/error.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/util/few.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/util/keyval_parse.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/util/malloc.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/util/opal_pty.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/util/os_path.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/util/qsort.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/util/show_help_lex.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/util/strncpy.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/util/sys_limits.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/util/trace.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/win32/ompi_inet.h: defined(c_plusplus)  defined(__cplusplus)
+./opal/win32/ompi_utsname.h: defined(c_plusplus)  defined(__cplusplus)
+./orte/mca/filem/filem.h: defined(c_plusplus)  defined(__cplusplus)
+./orte/mca/filem/rsh/filem_rsh.h: defined(c_plusplus)  defined(__cplusplus)
+./orte/mca/plm/ccp/plm_ccp.h: defined(c_plusplus)  defined(__cplusplus)
+./orte/mca/ras/ccp/ras_ccp.h: defined(c_plusplus)  defined(__cplusplus)
+./orte/mca/ras/gridengine/ras_gridengine.h: defined(c_plusplus)  defined(__cplusplus)
+./orte/mca/ras/loadleveler/ras_loadleveler.h: defined(c_plusplus)  defined(__cplusplus)
+./orte/mca/rmaps/rank_file/rmaps_rank_file_lex.h: defined(c_plusplus)  defined(__cplusplus)
+./orte/mca/rml/ftrm/rml_ftrm.h: defined(c_plusplus)  defined(__cplusplus)
+./test/support/components.h: defined(c_plusplus)  defined(__cplusplus)
+# Following some lex files:
+./opal/util/keyval/keyval_lex.l: defined(c_plusplus) defined(__cplusplus)
+./opal/util/show_help_lex.l: defined(c_plusplus) defined(__cplusplus)
+./ompi/mca/btl/openib/btl_openib_lex.l: defined(c_plusplus) defined(__cplusplus)
+./ompi/mca/btl/pcie/btl_pcie_lex.l: defined(c_plusplus) defined(__cplusplus)
+./orte/util/hostfile/hostfile_lex.l: defined(c_plusplus) defined(__cplusplus)

ompi/class/ompi_free_list.h

@@ -26,9 +26,7 @@
 #include "ompi/constants.h"
 #include "opal/sys/cache.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 struct mca_mem_pool_t;
 struct ompi_free_list_item_t;
@@ -306,8 +304,6 @@ static inline int __ompi_free_list_wait( ompi_free_list_t* fl,
         }                                                               \
     } while(0)
     
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif 
 

ompi/class/ompi_rb_tree.h

@@ -31,9 +31,7 @@
 #include "opal/class/opal_object.h"
 #include "ompi/class/ompi_free_list.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 /*
  * Data structures and datatypes
  */
@@ -215,8 +213,6 @@ OMPI_DECLSPEC int ompi_rb_tree_traverse(ompi_rb_tree_t *tree,
   */
 OMPI_DECLSPEC int ompi_rb_tree_size(ompi_rb_tree_t *tree);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif /* OMPI_RB_TREE_H */
 

ompi/class/ompi_seq_tracker.h

@@ -23,9 +23,7 @@
 #include "opal/class/opal_list.h"
 #include "ompi/constants.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 struct ompi_seq_tracker_range_t{ 
     opal_list_item_t super; 
@@ -67,8 +65,6 @@ OMPI_DECLSPEC void ompi_seq_tracker_insert(ompi_seq_tracker_t* seq_tracker, uint
  */
 OMPI_DECLSPEC void ompi_seq_tracker_copy(ompi_seq_tracker_t* dst, ompi_seq_tracker_t* src);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif 
 

ompi/debuggers/msgq_interface.h

@@ -124,9 +124,7 @@
 /* No MPI2 support yet */
 #define FOR_MPI2 0
 
-#ifdef	__cplusplus
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /***********************************************************************
  * Version of the interface this header represents 
@@ -693,7 +691,6 @@ extern int mqs_next_new_process (mqs_process *, mqs_process_location *);
 extern int mqs_set_process_identity (mqs_process *, int); 
 #endif
 
-#ifdef	__cplusplus
+END_C_DECLS
-}
+
-#endif
 #endif /* defined (_MPI_INTERFACE_INCLUDED) */

ompi/group/group.h

@@ -34,9 +34,7 @@
 #include "opal/class/opal_pointer_array.h"
 #include "opal/util/output.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 #define BSIZE ((int)sizeof(unsigned char)*8)
 
@@ -346,7 +344,5 @@ int ompi_group_dump (ompi_group_t* group);
  */
 int ompi_group_div_ceil (int num, int den);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif /* OMPI_GROUP_H */

ompi/include/mpi.h.in

@@ -2016,7 +2016,7 @@ OMPI_DECLSPEC  double PMPI_Wtime(void);
  *   - We are using a C++ compiler
  */
 #if !defined(OMPI_SKIP_MPICXX) && OMPI_WANT_CXX_BINDINGS && !OMPI_BUILDING
-#if defined(__cplusplus) || defined(c_plusplus)
+#if defined(c_plusplus) || defined(__cplusplus)
 #include "openmpi/ompi/mpi/cxx/mpicxx.h"
 #endif
 #endif

ompi/mca/allocator/base/base.h

@@ -27,9 +27,7 @@
 #include "opal/mca/mca.h"
 #include "ompi/mca/allocator/allocator.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 /**
  * Structure which describes a selected module.
  */
@@ -69,8 +67,6 @@ OMPI_DECLSPEC mca_allocator_base_component_t* mca_allocator_component_lookup(con
  */
 OMPI_DECLSPEC extern opal_list_t mca_allocator_base_components;
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif /* MCA_ALLOCATOR_BASE_H */

ompi/mca/allocator/basic/allocator_basic.h

@@ -58,9 +58,7 @@ struct mca_allocator_basic_module_t {
 typedef struct mca_allocator_basic_module_t mca_allocator_basic_module_t;
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /*
  * Component open/cleanup.
@@ -158,9 +156,7 @@ mca_allocator_base_module_t* mca_allocator_basic_component_init(
 
 OMPI_DECLSPEC extern mca_allocator_base_component_t mca_allocator_basic_component;
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif /* ALLOCATOR_BUCKET_ALLOC_H */
 

ompi/mca/allocator/bucket/allocator_bucket_alloc.h

@@ -28,9 +28,7 @@
 #include <string.h>
 #include "opal/threads/mutex.h"
 #include "ompi/mca/allocator/allocator.h"
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /**
   * Structure for the header of each memory chunk
@@ -215,8 +213,6 @@ typedef struct mca_allocator_bucket_t mca_allocator_bucket_t;
 
 OMPI_DECLSPEC extern mca_allocator_base_component_t mca_allocator_bucket_component;
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif /* ALLOCATOR_BUCKET_ALLOC_H */

ompi/mca/bml/base/base.h

@@ -30,9 +30,7 @@
  * Global functions for the BML
  */
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 
 struct mca_bml_base_selected_module_t {
@@ -66,7 +64,5 @@ OMPI_DECLSPEC extern mca_bml_base_component_t mca_bml_component;
 OMPI_DECLSPEC extern opal_list_t mca_bml_base_components_available; 
 OMPI_DECLSPEC extern mca_bml_base_module_t mca_bml; 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif /* MCA_BML_BASE_H */

ompi/mca/bml/base/bml_base_btl.h

@@ -28,9 +28,7 @@
  * Global functions for the BML
  */
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /* forward declarations */
 struct mca_bml_base_btl_array_t;
@@ -38,8 +36,6 @@ struct mca_bml_base_btl_array_t;
 OMPI_DECLSPEC int mca_bml_base_btl_array_reserve(struct mca_bml_base_btl_array_t* array, size_t size);
 
     
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif /* MCA_BML_BASE_H */
 

ompi/mca/bml/r2/bml_r2.h

@@ -32,9 +32,7 @@
 #include "ompi/types.h"
 #include "ompi/mca/bml/bml.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /**
  * BML module interface functions and attributes.
@@ -69,8 +67,6 @@ int mca_bml_r2_ft_event(int status);
 
 int mca_bml_r2_finalize( void );
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif /* OMPI_MCA_BML_R2_H */

ompi/mca/bml/r2/bml_r2_ft.h

@@ -22,12 +22,8 @@
 #define MCA_BML_R2_FT_H
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif

ompi/mca/btl/gm/btl_gm.h

@@ -36,9 +36,7 @@
 #include "ompi/mca/btl/btl.h"
 #include "btl_gm_endpoint.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 #define GM_BUFFER_SIZE   7
 #define GM_BUFFER_LENGTH gm_max_length_for_size(GM_BUFFER_SIZE)
@@ -375,7 +373,5 @@ do {
 } while (0)
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/gm/btl_gm_endpoint.h

@@ -28,9 +28,7 @@
 #include <arpa/inet.h>
 #endif
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 
 /**
@@ -91,7 +89,5 @@ typedef mca_btl_base_endpoint_t  mca_btl_gm_endpoint_t;
 
 OBJ_CLASS_DECLARATION(mca_btl_gm_endpoint_t);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/gm/btl_gm_frag.h

@@ -26,9 +26,7 @@
 #include "ompi/mca/btl/base/btl_base_error.h"
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 typedef enum {
     MCA_BTL_GM_EAGER,
@@ -137,7 +135,5 @@ do { \
 
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/gm/btl_gm_proc.h

@@ -24,9 +24,7 @@
 #include "btl_gm.h"
 #include "btl_gm_endpoint.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 OBJ_CLASS_DECLARATION(mca_btl_gm_proc_t);
 
 /**
@@ -65,7 +63,5 @@ typedef struct mca_btl_gm_proc_t mca_btl_gm_proc_t;
 mca_btl_gm_proc_t* mca_btl_gm_proc_create(ompi_proc_t* ompi_proc);
 int mca_btl_gm_proc_insert(mca_btl_gm_proc_t*, mca_btl_base_endpoint_t*);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/mx/btl_mx_endpoint.h

@@ -26,9 +26,7 @@
 
 #include <myriexpress.h>
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 #define MCA_BTL_MX_NOT_CONNECTED       0x0000
 #define MCA_BTL_MX_NOT_REACHEABLE      0x0001
@@ -90,7 +88,5 @@ typedef mca_btl_base_endpoint_t  mca_btl_mx_endpoint_t;
 
 OBJ_CLASS_DECLARATION(mca_btl_mx_endpoint_t);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/ofud/btl_ofud.h

@@ -44,9 +44,7 @@
 /* TODO - If I want this to go away, addr_t has to come over here */
 #include "btl_ofud_endpoint.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 
 /**
@@ -359,7 +357,5 @@ do {                                                                         \
 #define MCA_BTL_UD_SHOW_TIME(var)
 #endif
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/ofud/btl_ofud_endpoint.h

@@ -29,9 +29,7 @@
 #include "btl_ofud.h"
 #include "btl_ofud_frag.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 struct mca_btl_ud_addr_t {
     uint32_t qp_num;
@@ -68,7 +66,5 @@ OBJ_CLASS_DECLARATION(mca_btl_ud_endpoint_t);
 int mca_btl_ud_endpoint_post_send(struct mca_btl_ud_module_t* ud_btl,
                                   struct mca_btl_ud_frag_t * frag);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/ofud/btl_ofud_frag.h

@@ -30,9 +30,7 @@
 #include "btl_ofud.h"
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 
 /**
@@ -142,7 +140,5 @@ OBJ_CLASS_DECLARATION(mca_btl_ud_recv_frag_t);
 
 struct mca_btl_ud_module_t;
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/ofud/btl_ofud_proc.h

@@ -27,9 +27,7 @@
 #include "btl_ofud.h"
 #include "btl_ofud_endpoint.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /**
  * Represents the state of a remote process and the set of addresses
@@ -72,7 +70,5 @@ int mca_btl_ud_proc_insert(mca_btl_ud_proc_t*, mca_btl_base_endpoint_t*);
 
 int mca_btl_ud_proc_remove(mca_btl_ud_proc_t*, mca_btl_base_endpoint_t*);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/openib/btl_openib.h

@@ -648,9 +648,6 @@ static inline int qp_cq_prio(const int qp)
 #define BTL_OPENIB_RDMA_QP(QP) \
     ((QP) == mca_btl_openib_component.rdma_qp)
 
-#if defined(c_plusplus) || defined(__cplusplus)
-}
-#endif
 END_C_DECLS
 
 #endif /* MCA_BTL_IB_H */

ompi/mca/btl/openib/btl_openib_eager_rdma.h

@@ -13,9 +13,7 @@
 #include "ompi_config.h"
 #include "btl_openib.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 struct mca_btl_openib_eager_rdma_local_t {
     ompi_ptr_t base; /**< buffer for RDMAing eager messages */
@@ -95,8 +93,6 @@ typedef struct mca_btl_openib_eager_rdma_remote_t mca_btl_openib_eager_rdma_remo
     } while(0)
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif
 

ompi/mca/btl/openib/btl_openib_frag.h

@@ -28,9 +28,7 @@
 #include <infiniband/verbs.h>
 #include "ompi/mca/btl/btl.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 struct mca_btl_openib_reg_t;
 
@@ -347,7 +345,5 @@ typedef struct mca_btl_openib_frag_init_data_t mca_btl_openib_frag_init_data_t;
 void mca_btl_openib_frag_init(ompi_free_list_item_t* item, void* ctx);
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/openib/btl_openib_lex.h

@@ -35,9 +35,7 @@
 
 #include <stdio.h>
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 int btl_openib_ini_yylex(void);
 int btl_openib_ini_init_buffer(FILE *file);
@@ -70,8 +68,6 @@ enum {
     BTL_OPENIB_INI_PARSE_MAX
 };
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif

ompi/mca/btl/openib/btl_openib_lex.l

@@ -27,9 +27,7 @@
 
 #include "btl_openib_lex.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /*
  * local functions
@@ -37,9 +35,7 @@ extern "C" {
 static int finish_parsing(void) ;
 static int btl_openib_ini_yywrap(void);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 /*
  * global variables

ompi/mca/btl/openib/btl_openib_mca.h

@@ -10,16 +10,12 @@
 #ifndef MCA_BTL_IB_MCA_H
 #define MCA_BTL_IB_MCA_H
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
     /**
      * Function to register MCA params and check for sane values
      */
     int btl_openib_register_mca_params(void);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/pcie/btl_pcie_lex.l

@@ -30,9 +30,13 @@
 /*
  * local functions
  */
+BEGIN_C_DECLS
+
 static int finish_parsing(void) ;
 static int btl_pcie_cfg_yywrap(void);
 
+END_C_DECLS
+
 /*
  * global variables
  */

ompi/mca/btl/portals/btl_portals_endpoint.h

@@ -21,9 +21,7 @@
 
 #include "btl_portals.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /**
  * An abstraction that represents a connection to a endpoint process.
@@ -34,8 +32,6 @@ extern "C" {
     typedef ptl_process_id_t mca_btl_base_endpoint_t;
     typedef mca_btl_base_endpoint_t  mca_btl_portals_endpoint_t;
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif /* MCA_BTL_PORTALS_ENDPOINT_H */

ompi/mca/btl/portals/btl_portals_frag.h

@@ -19,9 +19,7 @@
 #ifndef OMPI_BTL_PORTALS_FRAG_H
 #define OMPI_BTL_PORTALS_FRAG_H
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /**
  * Portals send fragment derived type
@@ -116,7 +114,5 @@ OBJ_CLASS_DECLARATION(mca_btl_portals_frag_recv_t);
 }
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/sctp/btl_sctp.h

@@ -54,9 +54,7 @@
 #endif
 
 #define MCA_BTL_SCTP_STATISTICS 0
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 
 /**
@@ -326,7 +324,5 @@ extern mca_btl_base_descriptor_t* mca_btl_sctp_prepare_dst(
     uint32_t flags); 
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/sctp/btl_sctp_endpoint.h

@@ -23,9 +23,7 @@
 #include "opal/event/event.h"
 #include "btl_sctp_frag.h"
 #include "btl_sctp.h"
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 #define MCA_BTL_SCTP_ENDPOINT_CACHE 1
 
@@ -92,7 +90,5 @@ int  mca_btl_sctp_endpoint_send(mca_btl_base_endpoint_t*, struct mca_btl_sctp_fr
 bool mca_btl_sctp_endpoint_accept(mca_btl_base_endpoint_t*, struct sockaddr_in*, int);
 void mca_btl_sctp_endpoint_shutdown(mca_btl_base_endpoint_t*);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/sctp/btl_sctp_frag.h

@@ -33,9 +33,7 @@
 #include "btl_sctp.h" 
 #include "btl_sctp_hdr.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 #define MCA_BTL_SCTP_FRAG_IOVEC_NUMBER  4
 
@@ -131,7 +129,5 @@ bool mca_btl_sctp_frag_send(mca_btl_sctp_frag_t*, int sd);
 bool mca_btl_sctp_frag_recv(mca_btl_sctp_frag_t*, int sd, char *buf, int len);
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/sctp/btl_sctp_hdr.h

@@ -25,9 +25,7 @@
 #include "btl_sctp.h" 
 #include "opal/types.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /**
  * SCTP header.
@@ -62,7 +60,5 @@ typedef struct mca_btl_sctp_hdr_t mca_btl_sctp_hdr_t;
         hdr.size = ntoh64(hdr.size);  \
     } while (0)
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/sctp/btl_sctp_proc.h

@@ -26,9 +26,7 @@
 #include "btl_sctp_endpoint.h"
 #include <netinet/sctp.h>
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /**
  * Represents the state of a remote process and the set of addresses
@@ -109,7 +107,5 @@ void mca_btl_sctp_proc_add_vpid(orte_vpid_t vpid, struct mca_btl_sctp_proc_t *pr
 void mca_btl_sctp_proc_add_assoc_id(sctp_assoc_t id, struct mca_btl_sctp_proc_t *proc, struct mca_btl_sctp_proc_table_node *table);
 mca_btl_sctp_proc_t *mca_btl_sctp_proc_get(sctp_assoc_t id, struct mca_btl_sctp_proc_table_node *table);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/self/btl_self.h

@@ -34,9 +34,7 @@
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h" 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /**
  * Shared Memory (SELF) BTL module.
@@ -225,9 +223,7 @@ int mca_btl_self_rdma(
  */
 int mca_btl_self_ft_event(int state);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif
 

ompi/mca/btl/sm/btl_sm.h

@@ -47,9 +47,7 @@
 #include "ompi/mca/mpool/mpool.h"
 #include "ompi/mca/common/sm/common_sm_mmap.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /*
  * Shared Memory FIFOs
@@ -488,9 +486,7 @@ void mca_btl_sm_component_event_thread(opal_object_t*);
 #define MCA_BTL_SM_SIGNAL_PEER(peer)
 #endif
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif
 

ompi/mca/btl/tcp/btl_tcp.h

@@ -43,9 +43,7 @@
 #include "opal/class/opal_hash_table.h"
 
 #define MCA_BTL_TCP_STATISTICS 0
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 
 /**
@@ -335,7 +333,5 @@ extern mca_btl_base_descriptor_t* mca_btl_tcp_prepare_dst(
   */
 int mca_btl_tcp_ft_event(int state);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/tcp/btl_tcp_endpoint.h

@@ -23,9 +23,7 @@
 #include "opal/event/event.h"
 #include "btl_tcp_frag.h"
 #include "btl_tcp.h"
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 #define MCA_BTL_TCP_ENDPOINT_CACHE 1
 
@@ -81,7 +79,5 @@ int  mca_btl_tcp_endpoint_send(mca_btl_base_endpoint_t*, struct mca_btl_tcp_frag
 bool mca_btl_tcp_endpoint_accept(mca_btl_base_endpoint_t*, struct sockaddr*, int);
 void mca_btl_tcp_endpoint_shutdown(mca_btl_base_endpoint_t*);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/tcp/btl_tcp_frag.h

@@ -36,9 +36,7 @@
 #include "btl_tcp.h" 
 #include "btl_tcp_hdr.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 #define MCA_BTL_TCP_FRAG_IOVEC_NUMBER  4
 
@@ -127,7 +125,5 @@ bool mca_btl_tcp_frag_send(mca_btl_tcp_frag_t*, int sd);
 bool mca_btl_tcp_frag_recv(mca_btl_tcp_frag_t*, int sd);
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/tcp/btl_tcp_ft.h

@@ -25,14 +25,10 @@
 #include <sys/types.h>
 #endif
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif
 

ompi/mca/btl/tcp/btl_tcp_proc.h

@@ -26,9 +26,7 @@
 #include "btl_tcp_addr.h"
 #include "btl_tcp_endpoint.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /**
  * Represents the state of a remote process and the set of addresses
@@ -121,7 +119,5 @@ static inline mca_btl_tcp_proc_t* mca_btl_tcp_proc_local(void)
     return mca_btl_tcp_component.tcp_local;
 }
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/template/btl_template.h

@@ -33,9 +33,7 @@
 #include "ompi/mca/mpool/mpool.h" 
 #include "ompi/mca/btl/btl.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 #define MCA_BTL_HAS_MPOOL 1
 
@@ -313,7 +311,5 @@ extern mca_btl_base_descriptor_t* mca_btl_template_prepare_dst(
   */
 int mca_btl_template_ft_event(int state);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/template/btl_template_endpoint.h

@@ -23,9 +23,7 @@
 #include "opal/event/event.h"
 #include "btl_template_frag.h"
 #include "btl_template.h"
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /**
  * An abstraction that represents a connection to a endpoint process.
@@ -48,7 +46,5 @@ typedef struct mca_btl_base_endpoint_t mca_btl_base_endpoint_t;
 typedef mca_btl_base_endpoint_t  mca_btl_template_endpoint_t;
 OBJ_CLASS_DECLARATION(mca_btl_template_endpoint_t);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/template/btl_template_frag.h

@@ -24,9 +24,7 @@
 #include "ompi_config.h"
 #include "btl_template.h" 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /**
  * TEMPLATE send fratemplateent derived type.
@@ -106,7 +104,5 @@ OBJ_CLASS_DECLARATION(mca_btl_template_frag_user_t);
 
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/template/btl_template_proc.h

@@ -24,9 +24,7 @@
 #include "btl_template.h"
 #include "btl_template_endpoint.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /**
  * Represents the state of a remote process and the set of addresses
@@ -62,7 +60,5 @@ OBJ_CLASS_DECLARATION(mca_btl_template_proc_t);
 mca_btl_template_proc_t* mca_btl_template_proc_create(ompi_proc_t* ompi_proc);
 int mca_btl_template_proc_insert(mca_btl_template_proc_t*, mca_btl_base_endpoint_t*);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/udapl/btl_udapl.h

@@ -42,9 +42,7 @@
 #include "ompi/mca/btl/btl.h"
 #include "btl_udapl_endpoint.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 
 /**
@@ -467,7 +465,5 @@ extern mca_btl_base_descriptor_t* mca_btl_udapl_prepare_dst(
      */
 int mca_btl_udapl_ft_event(int state);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/udapl/btl_udapl_eager_rdma.h

@@ -15,9 +15,7 @@
 #include "ompi/mca/btl/udapl/btl_udapl_endpoint.h" 
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /*
  * Describe endpoint local memory region.
@@ -103,7 +101,5 @@ typedef struct mca_btl_udapl_eager_rdma_credit_t mca_btl_udapl_eager_rdma_credit
                                 (I) = 0;                                            \
                         } while (0)
     
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/udapl/btl_udapl_endpoint.h

@@ -30,9 +30,7 @@
 #include "btl_udapl.h"
 #include "btl_udapl_eager_rdma.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 
 #define BTL_UDAPL_TOKEN_AVAIL(E, C, T) \
@@ -216,7 +214,5 @@ mca_btl_udapl_endpoint_t* mca_btl_udapl_find_endpoint_address_match(
     struct mca_btl_udapl_module_t* btl,
     mca_btl_udapl_addr_t addr);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/udapl/btl_udapl_frag.h

@@ -27,9 +27,7 @@
 #define MCA_BTL_UDAPL_FRAG_ALIGN (8)
 #include "ompi_config.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 typedef enum {
     MCA_BTL_UDAPL_SEND,
@@ -195,7 +193,5 @@ OBJ_CLASS_DECLARATION(mca_btl_udapl_frag_eager_rdma_t);
         0 : (MCA_BTL_UDAPL_FRAG_ALIGN - ((S) % MCA_BTL_UDAPL_FRAG_ALIGN));   \
 } while (0);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/udapl/btl_udapl_mca.h

@@ -11,9 +11,7 @@
 #ifndef MCA_BTL_UDAPL_MCA_H
 #define MCA_BTL_UDAPL_MCA_H
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /* Define Integer Boundaries */
 #define REGINT_NEG_ONE_OK 0x01            /* value = -1 is valid */
@@ -61,7 +59,5 @@ extern "C" {
 int mca_btl_udapl_register_mca_params(void);
 
     
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/btl/udapl/btl_udapl_proc.h

@@ -25,9 +25,7 @@
 #include "btl_udapl.h"
 #include "btl_udapl_endpoint.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /**
  * Represents the state of a remote process and the set of addresses
@@ -68,7 +66,5 @@ OBJ_CLASS_DECLARATION(mca_btl_udapl_proc_t);
 mca_btl_udapl_proc_t* mca_btl_udapl_proc_create(ompi_proc_t* ompi_proc);
 int mca_btl_udapl_proc_insert(mca_btl_udapl_proc_t*, mca_btl_base_endpoint_t*);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/coll/tuned/coll_tuned_dynamic_file.h

@@ -25,16 +25,12 @@
 #include "coll_tuned_dynamic_rules.h"
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t** rules, int n_collectives);
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif /* MCA_COLL_TUNED_DYNAMIC_FILE_H_HAS_BEEN_INCLUDED */
 
 

ompi/mca/coll/tuned/coll_tuned_dynamic_rules.h

@@ -22,9 +22,7 @@
 
 #include "ompi_config.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 
 typedef struct msg_rule_s {
@@ -100,8 +98,6 @@ int ompi_coll_tuned_get_target_method_params (ompi_coll_com_rule_t* base_com_rul
                                               int* max_requests);
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif /* MCA_COLL_TUNED_DYNAMIC_RULES_H_HAS_BEEN_INCLUDED */
 

ompi/mca/coll/tuned/coll_tuned_topo.h

@@ -23,9 +23,7 @@
 
 #define MAXTREEFANOUT 32
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
     typedef struct ompi_coll_tree_t {
         int32_t tree_root;
@@ -59,9 +57,7 @@ extern "C" {
     /* debugging stuff, will be removed later */
     int ompi_coll_tuned_topo_dump_tree (ompi_coll_tree_t* tree, int rank);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif  /* MCA_COLL_TUNED_TOPO_H_HAS_BEEN_INCLUDED */
 

ompi/mca/coll/tuned/coll_tuned_util.h

@@ -27,9 +27,7 @@
 #include "ompi/request/request.h"
 #include "ompi/mca/pml/pml.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /* prototypes */
 int ompi_coll_tuned_sendrecv_actual( void* sendbuf, int scount, 
@@ -121,9 +119,7 @@ ompi_coll_tuned_isendrecv( void* sendbuf, int scount, ompi_datatype_t* sdtype,
    return ret;
 }
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif /* MCA_COLL_TUNED_UTIL_EXPORT_H */
 
 

ompi/mca/common/sm/common_sm_mmap.h

@@ -26,9 +26,7 @@
 #include "opal/sys/atomic.h"
 #include "ompi/mca/mpool/mpool.h" 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 struct mca_mpool_base_module_t;
 
@@ -124,9 +122,7 @@ int mca_common_sm_mmap_fini( mca_common_sm_mmap_t* sm_mmap );
 
 OMPI_DECLSPEC extern mca_common_sm_mmap_t *mca_common_sm_mmap;
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif
 

ompi/mca/crcp/base/base.h

@@ -28,9 +28,7 @@
  * Global functions for MCA overall CRCP
  */
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
     /**
      * Initialize the CRCP MCA framework
@@ -207,8 +205,6 @@ extern "C" {
     OMPI_DECLSPEC extern ompi_crcp_base_component_t ompi_crcp_base_selected_component;
     OMPI_DECLSPEC extern ompi_crcp_base_module_t ompi_crcp;
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif /* OMPI_CRCP_BASE_H */

ompi/mca/crcp/bkmrk/crcp_bkmrk.h

@@ -31,9 +31,7 @@
 #include MCA_timer_IMPLEMENTATION_HEADER
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
     /*
      * Local Component structures
@@ -59,8 +57,6 @@ extern "C" {
     int ompi_crcp_bkmrk_pml_init(void);
     int ompi_crcp_bkmrk_pml_finalize(void);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif /* MCA_CRCP_HOKE_EXPORT_H */

ompi/mca/crcp/bkmrk/crcp_bkmrk_btl.h

@@ -31,9 +31,7 @@
 #include "ompi/mca/crcp/crcp.h"
 #include "ompi/mca/crcp/bkmrk/crcp_bkmrk.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
     /*
      * BTL Coordination functions
@@ -121,8 +119,6 @@ extern "C" {
     (int state,
      ompi_crcp_base_btl_state_t*);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif /* MCA_CRCP_HOKE_BTL_EXPORT_H */

ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.h

@@ -32,9 +32,7 @@
 
 #include "ompi/mca/crcp/bkmrk/crcp_bkmrk.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
     /*
      * PML Coordination functions
@@ -444,8 +442,6 @@ extern "C" {
      */
     extern opal_list_t ompi_crcp_bkmrk_pml_peer_refs;
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif /* MCA_CRCP_HOKE_PML_EXPORT_H */

ompi/mca/crcp/crcp.h

@@ -45,9 +45,7 @@
 #include "ompi/mca/btl/btl.h"
 #include "ompi/mca/btl/base/base.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /**
  * Module initialization function.
@@ -360,8 +358,6 @@ OMPI_DECLSPEC extern ompi_crcp_base_module_t ompi_crcp;
 #define OMPI_CRCP_REQUEST_COMPLETE(req) ;
 #endif
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif /* OMPI_CRCP_H */

ompi/mca/io/base/base.h

@@ -38,9 +38,7 @@
  * Global functions for MCA overall io open and close
  */
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
     /**
      * Initialize the io MCA framework
      *
@@ -321,7 +319,5 @@ OMPI_DECLSPEC extern bool mca_io_base_requests_valid;
  */
 OMPI_DECLSPEC extern ompi_free_list_t mca_io_base_requests;
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif /* MCA_BASE_IO_H */

ompi/mca/io/base/io_base_request.h

@@ -53,9 +53,7 @@ struct mca_io_base_request_t {
  */
 typedef struct mca_io_base_request_t mca_io_base_request_t;
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
     /**
      * Declare the class
      */
@@ -159,8 +157,6 @@ extern "C" {
         return 0;
     }
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif

ompi/mca/io/romio/src/io_romio.h

@@ -30,9 +30,7 @@
 #include "romio/include/mpio.h"
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 OMPI_DECLSPEC extern mca_io_base_component_2_0_0_t mca_io_romio_component;
 
@@ -299,7 +297,5 @@ int mca_io_romio_file_sync (struct ompi_file_t *fh);
 
 /* End Prototypes */
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif                          /* MCA_IO_ROMIO_H */

ompi/mca/mpool/base/mpool_base_mem_cb.h

@@ -26,9 +26,7 @@
 #include "opal/mca/mca.h"
 #include "opal/memoryhooks/memory.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /*
  *  memory hook callback, called when memory is free'd out from under us
@@ -36,9 +34,7 @@ extern "C" {
     void mca_mpool_base_mem_cb(void* base, size_t size, void* cbdata,
                                bool from_alloc);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif /* MCA_MPOOL_BASE_MEM_CB_H */
 

ompi/mca/mpool/fake/mpool_fake.h

@@ -27,9 +27,7 @@
 #include "ompi_config.h"
 #include "ompi/mca/mpool/mpool.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 typedef struct mca_mpool_fake_component_t {
   mca_mpool_base_component_t super;
@@ -69,7 +67,5 @@ void mca_mpool_fake_finalize(struct mca_mpool_base_module_t *mpool);
  */
 int mca_mpool_fake_ft_event(int state);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/mpool/rdma/mpool_rdma.h

@@ -29,9 +29,7 @@
 #include "opal/event/event.h"
 #include "ompi/mca/mpool/mpool.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 struct mca_mpool_rdma_component_t {
     mca_mpool_base_component_t super;
@@ -131,7 +129,5 @@ void mca_mpool_rdma_finalize(struct mca_mpool_base_module_t *mpool);
  */
 int mca_mpool_rdma_ft_event(int state);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/mpool/sm/mpool_sm.h

@@ -27,9 +27,7 @@
 #include "ompi/mca/mpool/mpool.h"
 #include "ompi/mca/allocator/allocator.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 struct mca_mpool_sm_component_t {
   mca_mpool_base_component_t super;
@@ -100,8 +98,6 @@ void mca_mpool_sm_free(
  */
 int mca_mpool_sm_ft_event(int state);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif

ompi/mca/mtl/base/base.h

@@ -29,9 +29,7 @@
  * Global functions for the MTL
  */
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 OMPI_DECLSPEC extern mca_mtl_base_component_t* ompi_mtl_base_selected_component;
     
@@ -44,7 +42,5 @@ OMPI_DECLSPEC int ompi_mtl_base_close(void);
 OMPI_DECLSPEC extern opal_list_t ompi_mtl_base_components_opened;
 OMPI_DECLSPEC extern int ompi_mtl_base_output;
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif /* MCA_MTL_BASE_H */

ompi/mca/mtl/mtl.h

@@ -38,9 +38,7 @@
 #include "ompi/mca/pml/pml.h" /* for send_mode enum */
 #include "ompi/request/request.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 struct ompi_request_t;
 struct opal_convertor_t;
@@ -405,7 +403,5 @@ typedef struct mca_mtl_base_module_t mca_mtl_base_module_t;
 
 OMPI_DECLSPEC extern mca_mtl_base_module_t *ompi_mtl;
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/mtl/mx/mtl_mx.h

@@ -24,9 +24,7 @@
 #include "opal/datatype/opal_convertor.h"
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 int
 ompi_mtl_mx_send(struct mca_mtl_base_module_t* mtl, 
@@ -70,9 +68,7 @@ int ompi_mtl_mx_module_init(void);
     
 
    
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif  /* MTL_MX_H_HAS_BEEN_INCLUDED */
 

ompi/mca/mtl/mx/mtl_mx_endpoint.h

@@ -27,9 +27,7 @@
 
 #include "myriexpress.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 OBJ_CLASS_DECLARATION(mca_mtl_mx_endpoint_t);
 
@@ -70,7 +68,5 @@ OBJ_CLASS_DECLARATION(mca_mtl_mx_endpoint);
 mca_mtl_mx_endpoint_t* mca_mtl_mx_endpoint_create(ompi_proc_t*);
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/mtl/mx/mtl_mx_types.h

@@ -29,9 +29,7 @@
 #include "myriexpress.h"
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /** 
  * MTL Module Interface
@@ -121,9 +119,7 @@ OMPI_MODULE_DECLSPEC extern mca_mtl_mx_component_t mca_mtl_mx_component;
     
 
    
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif  /* MTL_MX_TYPES_H_HAS_BEEN_INCLUDED */
 

ompi/mca/mtl/portals/mtl_portals.h

@@ -29,9 +29,7 @@
 #include "ompi/mca/common/portals/common_portals.h"
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 struct mca_mtl_portals_module_t {
     mca_mtl_base_module_t base;
@@ -227,8 +225,6 @@ extern int ompi_mtl_portals_cancel(struct mca_mtl_base_module_t* mtl,
 extern int ompi_mtl_portals_progress(void);
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif  /* MTL_PORTALS_H_HAS_BEEN_INCLUDED */

ompi/mca/mtl/psm/mtl_psm.h

@@ -27,9 +27,7 @@
 #include <psm.h>
 #include <psm_mq.h>
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 
 /* MTL interface functions */
@@ -85,9 +83,7 @@ int ompi_mtl_psm_module_init(int local_rank, int num_local_procs);
     
 
    
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif  /* MTL_PSM_H_HAS_BEEN_INCLUDED */
 

ompi/mca/mtl/psm/mtl_psm_endpoint.h

@@ -27,9 +27,7 @@
 
 #include "psm.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 OBJ_CLASS_DECLARATION(mca_mtl_psm_endpoint_t);
 
@@ -57,7 +55,5 @@ typedef struct mca_mtl_base_endpoint_t mca_mtl_base_endpoint_t;
 typedef mca_mtl_base_endpoint_t  mca_mtl_psm_endpoint_t;
 OBJ_CLASS_DECLARATION(mca_mtl_psm_endpoint);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif

ompi/mca/mtl/psm/mtl_psm_types.h

@@ -30,9 +30,7 @@
 #include "psm.h"
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /** 
  * MTL Module Interface
@@ -84,9 +82,7 @@ OMPI_DECLSPEC mca_mtl_psm_component_t mca_mtl_psm_component;
 		(tagsel) &= ~0xffff00000000ULL;					\
 	} while (0)
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif  /* MTL_PSM_TYPES_H_HAS_BEEN_INCLUDED */
 

ompi/mca/pml/cm/pml_cm_component.h

@@ -20,17 +20,13 @@
 #ifndef MCA_PML_CM_COMPONENT_H
 #define MCA_PML_CM_COMPONENT_H
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /*
  * PML module functions.
  */
 extern mca_pml_base_component_2_0_0_t mca_pml_cm_component;
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif

ompi/mca/pml/crcpw/pml_crcpw.h

@@ -35,9 +35,7 @@
 #include "ompi/mca/crcp/crcp.h"
 #include "ompi/mca/crcp/base/base.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
     /**
      * CRCPW PML module
@@ -118,8 +116,6 @@ extern "C" {
     
     int mca_pml_crcpw_ft_event(int state);
     
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif /* MCA_PML_CRCPW_H */

ompi/mca/pml/csum/pml_csum_comm.h

@@ -24,9 +24,7 @@
 #include "opal/threads/mutex.h"
 #include "opal/class/opal_list.h"
 #include "ompi/proc/proc.h"
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 
 struct mca_pml_csum_comm_proc_t {
@@ -76,8 +74,6 @@ OBJ_CLASS_DECLARATION(mca_pml_csum_comm_t);
 
 extern int mca_pml_csum_comm_init_size(mca_pml_csum_comm_t* comm, size_t size);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif
 

ompi/mca/pml/dr/pml_dr.h

@@ -34,9 +34,7 @@
 #include "opal/class/opal_pointer_array.h"
 #include "ompi/datatype/ompi_datatype.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /**
  * DR PML module
@@ -209,9 +207,7 @@ extern int mca_pml_dr_start(
 
 extern int mca_pml_dr_ft_event(int state);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 
 #endif

ompi/mca/pml/dr/pml_dr_comm.h

@@ -26,9 +26,7 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/proc/proc.h"
 #include "pml_dr_endpoint.h"
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 
 struct mca_pml_dr_comm_proc_t {
@@ -83,8 +81,6 @@ OBJ_CLASS_DECLARATION(mca_pml_dr_comm_t);
 extern int mca_pml_dr_comm_init(mca_pml_dr_comm_t* dr_comm, ompi_communicator_t* ompi_comm);
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif
 

ompi/mca/pml/dr/pml_dr_component.h

@@ -20,17 +20,13 @@
 #ifndef MCA_PML_DR_COMPONENT_H
 #define MCA_PML_DR_COMPONENT_H
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /*
  * PML module functions.
  */
 OMPI_MODULE_DECLSPEC extern mca_pml_base_component_2_0_0_t mca_pml_dr_component;
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif

ompi/mca/pml/dr/pml_dr_endpoint.h

@@ -24,9 +24,7 @@
 #include "ompi/mca/bml/bml.h"
 #include "ompi/class/ompi_seq_tracker.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 /**
  *  This is the pml level endpoint
  *   simply inherity the bml_base_endpoint and 
@@ -48,8 +46,6 @@ typedef struct mca_pml_dr_endpoint_t mca_pml_dr_endpoint_t;
 OBJ_CLASS_DECLARATION(mca_pml_dr_endpoint_t);
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif
 

ompi/mca/pml/dr/pml_dr_recvfrag.h

@@ -26,9 +26,7 @@
 #include "ompi/mca/bml/bml.h" 
 #include "pml_dr_hdr.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 struct mca_pml_dr_buffer_t {
     ompi_free_list_item_t super;
@@ -166,8 +164,6 @@ bool mca_pml_dr_recv_frag_match( mca_pml_dr_comm_t* comm,
                                  mca_btl_base_segment_t* segments,
                                  size_t num_segments);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif
 

ompi/mca/pml/dr/pml_dr_recvreq.h

@@ -30,9 +30,7 @@
 #include "pml_dr_vfrag.h"
 #include "pml_dr_comm.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 
 struct mca_pml_dr_recv_request_t {
@@ -400,8 +398,6 @@ do {                                                                          \
    }                                                                          \
 } while(0)
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif
 

ompi/mca/pml/dr/pml_dr_sendreq.h

@@ -37,9 +37,7 @@
 #include "pml_dr_endpoint.h"
 #include "opal/event/event.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 struct mca_pml_dr_send_request_t {
     mca_pml_base_send_request_t req_send;
@@ -488,8 +486,6 @@ void mca_pml_dr_send_request_frag_ack(
 void mca_pml_dr_sendreq_cleanup_active(mca_btl_base_module_t* btl);
 
  
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif
 

ompi/mca/pml/dr/pml_dr_vfrag.h

@@ -26,9 +26,7 @@
 #include "opal/types.h"
 #include "pml_dr.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 #define MCA_PML_DR_VFRAG_NACKED  0x01
 #define MCA_PML_DR_VFRAG_RNDV    0x02
@@ -149,8 +147,6 @@ void mca_pml_dr_vfrag_reset(mca_pml_dr_vfrag_t*);
 
 void mca_pml_dr_vfrag_reschedule(mca_pml_dr_vfrag_t*);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif
 

ompi/mca/pml/example/pml_example.h

@@ -19,9 +19,7 @@
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/ptl/ptl.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 struct mca_pml_example_t {
     mca_pml_base_module_t super;
@@ -126,8 +124,6 @@ extern int mca_pml_example_start( size_t count, ompi_request_t** requests );
 extern int mca_pml_example_ft_event(int state);
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif  /* PML_EXAMPLE_H_HAS_BEEN_INCLUDED */

ompi/mca/pml/ob1/pml_ob1_comm.h

@@ -24,9 +24,7 @@
 #include "opal/threads/mutex.h"
 #include "opal/class/opal_list.h"
 #include "ompi/proc/proc.h"
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 
 struct mca_pml_ob1_comm_proc_t {
@@ -76,8 +74,6 @@ OBJ_CLASS_DECLARATION(mca_pml_ob1_comm_t);
 
 extern int mca_pml_ob1_comm_init_size(mca_pml_ob1_comm_t* comm, size_t size);
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif
 

ompi/mca/pml/ob1/pml_ob1_component.h

@@ -20,17 +20,13 @@
 #ifndef MCA_PML_OB1_COMPONENT_H
 #define MCA_PML_OB1_COMPONENT_H
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /*
  * PML module functions.
  */
 OMPI_MODULE_DECLSPEC extern mca_pml_base_component_2_0_0_t mca_pml_ob1_component;
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 
 #endif

ompi/mca/pml/ob1/pml_ob1_endpoint.h

@@ -21,12 +21,8 @@
 #ifndef MCA_PML_OB1_ENDPOINT_H
 #define MCA_PML_OB1_ENDPOINT_H
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
+
-#endif
+END_C_DECLS
-
-#if defined(c_plusplus) || defined(__cplusplus)
-}
-#endif
 #endif
 

ompi/mca/pml/ob1/pml_ob1_rdmafrag.h

@@ -25,9 +25,7 @@
 #include "ompi/mca/btl/btl.h"
 #include "pml_ob1_hdr.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 typedef enum {
     MCA_PML_OB1_RDMA_PUT,
@@ -67,8 +65,6 @@ do {                                                            \
 } while(0)
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif
 

ompi/mca/pml/ob1/pml_ob1_recvfrag.h

@@ -26,9 +26,7 @@
 #include "ompi/mca/btl/btl.h"
 #include "pml_ob1_hdr.h"
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 struct mca_pml_ob1_buffer_t {
     size_t len;
@@ -168,8 +166,6 @@ extern void mca_pml_ob1_recv_frag_callback_fin( mca_btl_base_module_t *btl,
                                                 void* cbdata );
 
                                               
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif
 

ompi/mca/pml/pml.h

@@ -65,9 +65,7 @@
 #include "opal/mca/mca.h"
 #include "mpi.h" /* needed for MPI_ANY_TAG */
 
-#if defined(c_plusplus) || defined(__cplusplus)
+BEGIN_C_DECLS
-extern "C" {
-#endif
 
 /*
  * PML component types
@@ -538,7 +536,5 @@ typedef mca_pml_base_module_1_0_0_t mca_pml_base_module_t;
 OMPI_DECLSPEC extern mca_pml_base_module_t mca_pml;
 
 
-#if defined(c_plusplus) || defined(__cplusplus)
+END_C_DECLS
-}
-#endif
 #endif /* MCA_PML_H */