[OpenMP] Redefined macro warning in libomptarget

[grokos]

Summary

After commit rL293468, macro __STDC_FORMAT_MACROS is defined twice:

1. the compile line for omptarget.cpp specifies -D__STDC_FORMAT_MACROS
2. Now the macro is also defined in omptarget.h

This results in a warning. If libomptarget is compiled with -Werror, compilation will fail.
This is a patch which allow the definition of that macro in omptarget.h only if it has not been defined again.

Thanks to Carlo for finding out about the problem.

[Hahnfeld]

Ah, I see: LLVM root's CMakeLists.txt adds the definition. I tested an out-of-tree Debug build where this is not the case. Sorry for the trouble!

openmp/trunk/libomptarget/src/omptarget.h

 #ifdef OMPTARGET_DEBUG
 #include <stdio.h>
 #define DEBUGP(prefix, ...)                                                    \
   {                                                                            \
     fprintf(stderr, "%s --> ", prefix);                                        \
     fprintf(stderr, __VA_ARGS__);                                              \
   }
 
+#ifndef __STDC_FORMAT_MACROS
 #define __STDC_FORMAT_MACROS
+#endif
+
 #include <inttypes.h>
 #define DPxMOD "0x%0*" PRIxPTR
 #define DPxPTR(ptr) ((int)(2*sizeof(uintptr_t))), ((uintptr_t) (ptr))
 
 /*
  * To printf a pointer in hex with a fixed width of 16 digits and a leading 0x,
  * use printf("ptr=" DPxMOD "...\n", DPxPTR(ptr));
  *