Re-apply SVN 4204 (parts missing when merged by 4272)

OCamlPro · Jun 16, 2024 · cd69c97 · cd69c97
1 parent ac4fe1f
commit cd69c97
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/cobc/cobc.c b/cobc/cobc.c
@@ -207,17 +207,17 @@ const size_t COBC_MEM_SIZE =
 	((sizeof(struct cobc_mem_struct) + sizeof(long long) - 1)
 	/ sizeof(long long)) * sizeof(long long);
 
-#define	COB_EXCEPTION(code,tag,name,fatal) {name, 0x##code, 0, 0, fatal},
+#define	COB_EXCEPTION(code,tag,name,fatal) {name, 0x##code, 0, fatal},
 struct cb_exception cb_exception_table[] = {
-	{NULL, 0, 0, 0, 0},	/* CB_EC_ZERO */
+	{NULL, 0, 0, 0},	/* CB_EC_ZERO */
 #include "../libcob/exception.def"
-	{NULL, 0, 0, 0, 0}	/* CB_EC_MAX */
+	{NULL, 0, 0, 0}		/* CB_EC_MAX */
 };
 
 const struct cb_exception cb_io_exception_table[] = {
-	{NULL, 0, 0, 0, 0},
+	{NULL, 0, 0, 0},
 #include "libcob/exception-io.def"
-	{NULL, 0, 0, 0, 0}	/* CB_EC_MAX */
+	{NULL, 0, 0, 0}		/* CB_EC_MAX */
 };
 #undef	COB_EXCEPTION
 const size_t	cb_io_exception_table_len = sizeof (cb_io_exception_table) / sizeof (struct cb_exception);

diff --git a/cobc/cobc.h b/cobc/cobc.h
@@ -266,7 +266,6 @@ struct cb_exception {
 	const char	*name;			/* Exception name */
 	const int	code;			/* Exception code */
 	int		enable;			/* If turned on */
-	int		explicit_enable_val;	/* enable has been set explicitly */
 	int		fatal;			/* If recognizing this should abort */
 };
 
@@ -353,7 +352,6 @@ extern const size_t		cb_exception_table_len;
 #define CB_EXCEPTION_NAME(id)	cb_exception_table[id].name
 #define CB_EXCEPTION_CODE(id)	cb_exception_table[id].code
 #define CB_EXCEPTION_ENABLE(id)	cb_exception_table[id].enable
-#define CB_EXCEPTION_EXPLICIT(id)	cb_exception_table[id].explicit_enable_val
 #define CB_EXCEPTION_FATAL(id)	cb_exception_table[id].fatal
 
 extern struct cb_turn_list	*cb_turn_list;