From 854c029b1591ebd146da66d03d38cd0b41b94ddf Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Fri, 10 Sep 1993 13:41:02 +0000
Subject: [PATCH] *** empty log message ***

---
 src/conflicts.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/conflicts.c b/src/conflicts.c
index 4ed9dea7..03dc1cf9 100644
--- a/src/conflicts.c
+++ b/src/conflicts.c
@@ -29,7 +29,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "state.h"
 
 
-#ifdef __GNUC__
+#ifndef __GNUC__
+#undef alloca
 #define alloca __builtin_alloca
 #else
 #ifdef HAVE_ALLOCA_H
-- 
2.47.2