ompi: use #ifndef for header file guards

Open MPI consistently used #ifndef header guards but some files use
the more dominant style in Open MPI. This also helps with clang-format
when indenting macros after #if.

Signed-off-by: Nathan Hjelm <[email protected]>

Author: hjelmn

ompi/communicator/comm_request.h

@@ -9,7 +9,7 @@
  * $HEADER$
  */
 
-#if !defined(OMPI_COMM_REQ_H)
+#ifndef OMPI_COMM_REQ_H
 #define OMPI_COMM_REQ_H
 
 #include "opal/class/opal_list.h"

ompi/mca/osc/rdma/osc_rdma_accumulate.h

@@ -11,7 +11,7 @@
  * $HEADER$
  */
 
-#if !defined(OSC_RDMA_ACCUMULATE_H)
+#ifndef OSC_RDMA_ACCUMULATE_H
 #define OSC_RDMA_ACCUMULATE_H
 
 #include "osc_rdma.h"

ompi/mca/osc/rdma/osc_rdma_active_target.h

@@ -20,7 +20,7 @@
  * $HEADER$
  */
 
-#if !defined(OSC_RDMA_ACTIVE_TARGET_H)
+#ifndef OSC_RDMA_ACTIVE_TARGET_H
 #define OSC_RDMA_ACTIVE_TARGET_H
 
 #include "osc_rdma.h"

ompi/mca/osc/rdma/osc_rdma_comm.h

@@ -11,7 +11,7 @@
  * $HEADER$
  */
 
-#if !defined(OMPI_OSC_RDMA_COMM_H)
+#ifndef OMPI_OSC_RDMA_COMM_H
 #define OMPI_OSC_RDMA_COMM_H
 
 #include "osc_rdma_dynamic.h"

ompi/mca/osc/rdma/osc_rdma_lock.h

@@ -12,7 +12,7 @@
  * $HEADER$
  */
 
-#if !defined(OMPI_OSC_RDMA_LOCK_H)
+#ifndef OMPI_OSC_RDMA_LOCK_H
 #define OMPI_OSC_RDMA_LOCK_H
 
 #include "osc_rdma_types.h"

ompi/mca/osc/rdma/osc_rdma_passive_target.h

@@ -10,7 +10,7 @@
  * $HEADER$
  */
 
-#if !defined(OSC_RDMA_PASSIVE_TARGET_H)
+#ifndef OSC_RDMA_PASSIVE_TARGET_H
 #define OSC_RDMA_PASSIVE_TARGET_H
 
 #include "osc_rdma.h"
@@ -129,4 +129,4 @@ int ompi_osc_rdma_flush_local (int target, struct ompi_win_t *win);
  */
 int ompi_osc_rdma_flush_local_all (struct ompi_win_t *win);
 
-#endif
+#endif /* OSC_RDMA_PASSIVE_TARGET_H */

ompi/mca/osc/rdma/osc_rdma_sync.h

@@ -10,7 +10,7 @@
  * $HEADER$
  */
 
-#if !defined(OSC_RDMA_SYNC_H)
+#ifndef OSC_RDMA_SYNC_H
 #define OSC_RDMA_SYNC_H
 
 #include "ompi/group/group.h"

ompi/mpi/tool/mpit-internal.h

@@ -12,7 +12,7 @@
  * $HEADER$
  */
 
-#if !defined(MPIT_INTERNAL_H)
+#ifndef MPIT_INTERNAL_H
 #define MPIT_INTERNAL_H
 
 #include "opal/util/string_copy.h"
@@ -73,4 +73,4 @@ static inline void mpit_copy_string (char *dest, int *len, const char *source)
     }
 }
 
-#endif /* !defined(MPIT_INTERNAL_H) */
+#endif /* MPIT_INTERNAL_H */

ompi/runtime/ompi_info_support.h

@@ -20,7 +20,7 @@
  * $HEADER$
  */
 
-#if !defined(OMPI_INFO_SUPPORT_H)
+#ifndef OMPI_INFO_SUPPORT_H
 #define OMPI_INFO_SUPPORT_H
 
 #include "opal/class/opal_pointer_array.h"
@@ -33,4 +33,4 @@ OMPI_DECLSPEC void  ompi_info_close_components(void);
 
 OMPI_DECLSPEC void ompi_info_show_ompi_version(const char *scope);
 
-#endif /* !defined(OMPI_INFO_SUPPORT_H) */
+#endif /* OMPI_INFO_SUPPORT_H */