From b84bb29de922b727ae8c37e88c670b299a3c52d8 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@ericsson.com>
Date: Wed, 16 Jan 2019 17:01:42 -0500
Subject: [PATCH] Actually remove definitions of DEFINE_NON_INLINE_P and
 DEFINE_INLINE_P

I applied the patch "Do not expand macros to 'defined'" by hand because
I couldn't apply it with git-am, and of course forgot to remove the
macro definitions.  This patch fixes it, and also makes the ChangeLog
entry a bit cleaner.
---
 sim/common/ChangeLog    | 2 +-
 sim/common/sim-arange.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 1fddb4e7e3c..c05b5352377 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,6 +1,6 @@
 2019-01-16  Pavel I. Kryukov  <kryukov@frtk.ru>
 
-	* sim-arange.c: eliminate DEFINE_NON_INLINE_P
+	* sim-arange.c (DEFINE_INLINE_P, DEFINE_NON_INLINE_P): Remove.
 
 2019-01-15  Simon Marchi  <simon.marchi@ericsson.com>
 
diff --git a/sim/common/sim-arange.c b/sim/common/sim-arange.c
index 0f0c8a1ce28..b3488ab564a 100644
--- a/sim/common/sim-arange.c
+++ b/sim/common/sim-arange.c
@@ -32,9 +32,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <string.h>
 #endif
 
-#define DEFINE_INLINE_P (! defined (SIM_ARANGE_C_INCLUDED))
-#define DEFINE_NON_INLINE_P defined (SIM_ARANGE_C_INCLUDED)
-
 #ifdef SIM_ARANGE_C_INCLUDED
 
 /* Insert a range.  */
-- 
GitLab