Fix CCN3296

If we are building using the native codepage (EBCDIC) we do not need to include this header. Otherwise `OMR_EBCDIC` will be defined and we will be linking with the atoe library so this header will be on the include path and we can safely include it. ``` WARNING CCN3296 /openzdk/jenkins/workspace/Build/port/unix_include/omriconvhelpers.h:38 #include file "atoe.h" not found. ```
eclipse · Aug 18, 2021 · 9309637 · 9309637
1 parent a04804f
commit 9309637
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 0 deletions.
diff --git a/port/common/omrfilestream.c b/port/common/omrfilestream.c
@@ -43,7 +43,9 @@
 
 #if defined(J9ZOS390)
 /* Needed for a translation table from ascii -> ebcdic */
+#if !defined(OMR_EBCDIC)
 #include "atoe.h"
+#endif
 
 /*
  * a2e overrides many functions to use ASCII strings.

diff --git a/port/common/omrfilestreamtext.c b/port/common/omrfilestreamtext.c
@@ -41,7 +41,9 @@
 
 #if defined(J9ZOS390)
 /* Needed for a translation table from ascii -> ebcdic */
+#if !defined(OMR_EBCDIC)
 #include "atoe.h"
+#endif
 
 /* a2e overrides many functions to use ASCII strings.
  * We need the native EBCDIC string

diff --git a/port/unix/omrfiletext.c b/port/unix/omrfiletext.c
@@ -51,7 +51,9 @@
 
 /* a2e overrides nl_langinfo to return ASCII strings. We need the native EBCDIC string */
 #if defined(J9ZOS390)
+#if !defined(OMR_EBCDIC)
 #include "atoe.h"
+#endif
 #if defined (nl_langinfo)
 #undef nl_langinfo
 #endif

diff --git a/port/unix/omrsharedhelper.c b/port/unix/omrsharedhelper.c
@@ -36,7 +36,9 @@
 #include <fcntl.h>
 
 #if defined(J9ZOS390)
+#if !defined(OMR_EBCDIC)
 #include "atoe.h"
+#endif
 #include "spawn.h"
 #include "sys/wait.h"
 #endif

diff --git a/port/unix/omrsysinfo.c b/port/unix/omrsysinfo.c
@@ -176,7 +176,9 @@
 #if defined(J9ZOS390)
 #include <sys/ps.h>
 #include <sys/types.h>
+#if !defined(OMR_EBCDIC)
 #include "atoe.h"
+#endif
 
 #if !defined(PATH_MAX)
 /* This is a somewhat arbitrarily selected fixed buffer size. */

diff --git a/port/unix_include/omriconvhelpers.h b/port/unix_include/omriconvhelpers.h
@@ -35,8 +35,10 @@
 
 #if defined(J9ZOS390)
 #define J9VM_CACHE_ICONV_DESC
+#if !defined(OMR_EBCDIC)
 #include "atoe.h"
 #endif
+#endif
 #include <iconv.h>
 #define J9VM_INVALID_ICONV_DESCRIPTOR ((iconv_t)(-1))
 #define J9VM_PROVIDE_ICONV

diff --git a/port/zos390/omrgetjobname.c b/port/zos390/omrgetjobname.c
@@ -29,7 +29,9 @@
 #include <string.h>
 #include "omrport.h"
 #include "omrgetjobname.h"
+#if defined(J9ZOS390) && !defined(OMR_EBCDIC)
 #include "atoe.h"
+#endif
 
 #define J9_MAX_JOBNAME 16
 

diff --git a/port/zos390/omrgetuserid.c b/port/zos390/omrgetuserid.c
@@ -27,7 +27,9 @@
  */
 #include <stdlib.h>
 #include <string.h>
+#if defined(J9ZOS390) && !defined(OMR_EBCDIC)
 #include "atoe.h"
+#endif
 #include "omrgetuserid.h"
 
 #define J9_MAX_USERID 16

diff --git a/port/zos390/omrosdump.c b/port/zos390/omrosdump.c
@@ -38,7 +38,9 @@
 #include <pwd.h>
 #include <ctest.h>
 #include "omrport.h"
+#if defined(J9ZOS390) && !defined(OMR_EBCDIC)
 #include "atoe.h"
+#endif
 #include "portnls.h"
 
 static void convertToUpper(struct OMRPortLibrary *portLibrary, char *toConvert, uintptr_t len);

diff --git a/port/zos390/omrsysinfo_helpers.c b/port/zos390/omrsysinfo_helpers.c
@@ -29,7 +29,9 @@
 #include <errno.h>
 #include <sys/__wlm.h>
 
+#if defined(J9ZOS390) && !defined(OMR_EBCDIC)
 #include "atoe.h"
+#endif
 #include "omrport.h"
 #include "omrsimap.h"
 #include "omrzfs.h"

diff --git a/port/zos390/omrsyslog.c b/port/zos390/omrsyslog.c
@@ -26,7 +26,9 @@
  * @brief System logging support
  */
 #include "omrportpriv.h"
+#if defined(J9ZOS390) && !defined(OMR_EBCDIC)
 #include "atoe.h"
+#endif
 #include <string.h>
 #include <sys/__messag.h>
 

diff --git a/port/zos390/omrzfs.c b/port/zos390/omrzfs.c
@@ -30,7 +30,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#if defined(J9ZOS390) && !defined(OMR_EBCDIC)
 #include "atoe.h"
+#endif
 #include "omrport.h"
 #include "omrzfs.h"
 #include "omrsysinfo_helpers.h"