- Again, no need for #include "orte/util/show_help.h"

- Use BEGIN_C_DECLS and END_C_DECLS

This commit was SVN r20358.

ompi/mca/allocator/allocator.h

@@ -26,10 +26,8 @@
 
 struct mca_mpool_base_resources_t;
 
+BEGIN_C_DECLS
 
-#if defined(c_plusplus) || defined(__cplusplus)
-extern "C" {
-#endif
 /* Here so that we can use mca_allocator_base_module_t in the function typedefs */
 struct mca_allocator_base_module_t;
 
@@ -110,7 +108,7 @@ typedef void* (*mca_allocator_base_component_segment_alloc_fn_t)(
 /**
   * A function to free memory from the control of the allocator framework 
   * back to the system. This function is to be provided by the module to the
-  * allocator frmaework.
+  * allocator framework.
   */
 typedef void (*mca_allocator_base_component_segment_free_fn_t)(
     struct mca_mpool_base_module_t* module,
@@ -158,8 +156,7 @@ typedef struct mca_allocator_base_component_2_0_0_t mca_allocator_base_component
  */
 OMPI_DECLSPEC extern int mca_allocator_base_output;
 
-#if defined(c_plusplus) || defined(__cplusplus)
-}
-#endif
+END_C_DECLS
+
 #endif /* MCA_ALLOCATOR_H */
 

ompi/mca/allocator/basic/allocator_basic.c

@@ -19,7 +19,6 @@
  */
 
 #include "ompi_config.h"
-#include "orte/util/show_help.h"
 #include "allocator_basic.h"
 #include "ompi/constants.h"