|
|
073ecbe |
From 8d2617110facddc2ba709db28abd710e7ce2ca38 Mon Sep 17 00:00:00 2001
|
|
|
073ecbe |
From: mc78 <mc78@outlook.de>
|
|
|
073ecbe |
Date: Sun, 17 Nov 2019 15:57:34 +0100
|
|
|
a4f04fe |
Subject: [PATCH 104/170] Removed additional exit constants definitions from
|
|
|
073ecbe |
cc65.h to stdlih.h. Guarded the definitions by #ifdef. Removed cc65.h
|
|
|
073ecbe |
includes from abort and assert implementations.
|
|
|
073ecbe |
|
|
|
073ecbe |
---
|
|
|
073ecbe |
include/cc65.h | 8 --------
|
|
|
073ecbe |
include/stdlib.h | 11 +++++++++++
|
|
|
073ecbe |
libsrc/common/_afailed.c | 1 -
|
|
|
073ecbe |
libsrc/common/abort.c | 1 -
|
|
|
073ecbe |
libsrc/geos-common/common/_afailed.c | 1 -
|
|
|
073ecbe |
libsrc/geos-common/common/abort.c | 1 -
|
|
|
073ecbe |
6 files changed, 11 insertions(+), 12 deletions(-)
|
|
|
073ecbe |
|
|
|
073ecbe |
diff --git a/include/cc65.h b/include/cc65.h
|
|
|
073ecbe |
index 9506cf10..720f1cd0 100644
|
|
|
073ecbe |
--- a/include/cc65.h
|
|
|
073ecbe |
+++ b/include/cc65.h
|
|
|
073ecbe |
@@ -37,14 +37,6 @@
|
|
|
073ecbe |
#define _CC65_H
|
|
|
073ecbe |
|
|
|
073ecbe |
|
|
|
073ecbe |
-/* Those cc65 exit constants definitions are in addition the the
|
|
|
073ecbe |
- constants defined in stdlib.h. The values 0 and 1 are still
|
|
|
073ecbe |
- reserved for EXIT_SUCCESS and EXIT_FAILURE and should not be
|
|
|
073ecbe |
- redefined */
|
|
|
073ecbe |
-#define EXIT_ASSERT 2
|
|
|
073ecbe |
-#define EXIT_ABORT 3
|
|
|
073ecbe |
-
|
|
|
073ecbe |
-
|
|
|
073ecbe |
/*****************************************************************************/
|
|
|
073ecbe |
/* Code */
|
|
|
073ecbe |
/*****************************************************************************/
|
|
|
073ecbe |
diff --git a/include/stdlib.h b/include/stdlib.h
|
|
|
073ecbe |
index 3103172d..638cb475 100644
|
|
|
073ecbe |
--- a/include/stdlib.h
|
|
|
073ecbe |
+++ b/include/stdlib.h
|
|
|
073ecbe |
@@ -48,6 +48,17 @@ typedef unsigned size_t;
|
|
|
073ecbe |
#define EXIT_SUCCESS 0
|
|
|
073ecbe |
#define EXIT_FAILURE 1
|
|
|
073ecbe |
|
|
|
073ecbe |
+#if __CC65_STD__ == __CC65_STD_CC65__
|
|
|
073ecbe |
+
|
|
|
073ecbe |
+/* Those non-standard cc65 exit constants definitions are in addition
|
|
|
073ecbe |
+ to the EXIT_SUCCESS and EXIT_FAILURE constants, which should not be
|
|
|
073ecbe |
+ redefined */
|
|
|
073ecbe |
+#define EXIT_ASSERT 2
|
|
|
073ecbe |
+#define EXIT_ABORT 3
|
|
|
073ecbe |
+
|
|
|
073ecbe |
+#endif
|
|
|
073ecbe |
+
|
|
|
073ecbe |
+
|
|
|
073ecbe |
/* Return type of the div function */
|
|
|
073ecbe |
typedef struct {
|
|
|
073ecbe |
int rem;
|
|
|
073ecbe |
diff --git a/libsrc/common/_afailed.c b/libsrc/common/_afailed.c
|
|
|
073ecbe |
index 7df2db60..ad50a875 100644
|
|
|
073ecbe |
--- a/libsrc/common/_afailed.c
|
|
|
073ecbe |
+++ b/libsrc/common/_afailed.c
|
|
|
073ecbe |
@@ -10,7 +10,6 @@
|
|
|
073ecbe |
#include <signal.h>
|
|
|
073ecbe |
#include <stdio.h>
|
|
|
073ecbe |
#include <stdlib.h>
|
|
|
073ecbe |
-#include <cc65.h>
|
|
|
073ecbe |
|
|
|
073ecbe |
|
|
|
073ecbe |
void __fastcall__ _afailed (char* file, unsigned line)
|
|
|
073ecbe |
diff --git a/libsrc/common/abort.c b/libsrc/common/abort.c
|
|
|
073ecbe |
index af0d8c31..1dda559b 100644
|
|
|
073ecbe |
--- a/libsrc/common/abort.c
|
|
|
073ecbe |
+++ b/libsrc/common/abort.c
|
|
|
073ecbe |
@@ -9,7 +9,6 @@
|
|
|
073ecbe |
#include <stdio.h>
|
|
|
073ecbe |
#include <stdlib.h>
|
|
|
073ecbe |
#include <signal.h>
|
|
|
073ecbe |
-#include <cc65.h>
|
|
|
073ecbe |
|
|
|
073ecbe |
|
|
|
073ecbe |
void abort (void)
|
|
|
073ecbe |
diff --git a/libsrc/geos-common/common/_afailed.c b/libsrc/geos-common/common/_afailed.c
|
|
|
073ecbe |
index 63f23496..97727d60 100644
|
|
|
073ecbe |
--- a/libsrc/geos-common/common/_afailed.c
|
|
|
073ecbe |
+++ b/libsrc/geos-common/common/_afailed.c
|
|
|
073ecbe |
@@ -7,7 +7,6 @@
|
|
|
073ecbe |
#include <stdio.h>
|
|
|
073ecbe |
#include <stdlib.h>
|
|
|
073ecbe |
#include <geos.h>
|
|
|
073ecbe |
-#include <cc65.h>
|
|
|
073ecbe |
|
|
|
073ecbe |
void _afailed (char* file, unsigned line)
|
|
|
073ecbe |
{
|
|
|
073ecbe |
diff --git a/libsrc/geos-common/common/abort.c b/libsrc/geos-common/common/abort.c
|
|
|
073ecbe |
index 92ed745a..90a65128 100644
|
|
|
073ecbe |
--- a/libsrc/geos-common/common/abort.c
|
|
|
073ecbe |
+++ b/libsrc/geos-common/common/abort.c
|
|
|
073ecbe |
@@ -6,7 +6,6 @@
|
|
|
073ecbe |
|
|
|
073ecbe |
#include <stdlib.h>
|
|
|
073ecbe |
#include <geos.h>
|
|
|
073ecbe |
-#include <cc65.h>
|
|
|
073ecbe |
|
|
|
073ecbe |
void abort (void)
|
|
|
073ecbe |
{
|
|
|
073ecbe |
--
|
|
|
a4f04fe |
2.26.0
|
|
|
073ecbe |
|