Merge branch 'testFailOnGcc5' into release/v1.5.1J

Author: n-isaka

libcob.h

@@ -37,6 +37,7 @@ extern "C" {
 #include <libcob/strings.h>
 #include <libcob/termio.h>
 #include <libcob/intrinsic.h>
+#include <libcob/codegen.h>
 
 #ifdef __cplusplus
 }

libcob/fileio.c

@@ -215,6 +215,7 @@ struct dirent		*listdir_filedata;
 #define        READOPTSSIZE  4
 #define        STARTCONDSIZE 2
 #define        EXCPTCODESIZE 6
+#define        FNSTATUSSIZE  3
 
 cob_file		*cob_error_file;
 
@@ -4120,7 +4121,7 @@ cob_invoke_fun (int operate, char *f, cob_field *key, char *rec,
 	char	oper[OPENMODESIZE];
 	char	excpcode[EXCPTCODESIZE];
 	char	*p_excpcode = excpcode;
-	char	tmpfnstatus[2];
+	char	tmpfnstatus[FNSTATUSSIZE];
 	char	*p_tmpfnstatus = tmpfnstatus;
 	int		status1 = 0;
 	int	(*funcint)();

libcob/numeric.c

@@ -30,12 +30,10 @@
 /* Force symbol exports */
 #define	COB_LIB_EXPIMP
 
+#define	COB_LIB_INCLUDE
 #include "libcob.h"
 #include "coblocal.h"
 
-#define	COB_LIB_INCLUDE
-#include "codegen.h"
-
 #define DECIMAL_NAN	-128
 #define DECIMAL_CHECK(d1,d2) \
   if (unlikely(d1->scale == DECIMAL_NAN || d2->scale == DECIMAL_NAN)) { \