From: Jim Blandy <jimb@red-bean.com>
Date: Thu, 24 Dec 1992 06:48:09 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7562765bf08c5dee8aa0737ee2de4511b87e4e9;p=pspp

*** empty log message ***
---

diff --git a/configure.in b/configure.in
index f0fc780250..2491a2036d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(regex.c)
 
+dnl Because regex may or may not be used with Autoconf, we need to know.
+AC_DEFINE(USING_AUTOCONF)
+
 AC_PROG_CC
 AC_PROG_INSTALL
 
diff --git a/regex.h b/regex.h
index 8217fc0ea0..ea701231c2 100644
--- a/regex.h
+++ b/regex.h
@@ -393,12 +393,25 @@ typedef struct
    already been defined, as by Autoconf's AC_CONST, don't do anything.  */
 
 #if __STDC__
+
 #define _RE_ARGS(args) args
+
 #else /* not __STDC__ */
+
 #define _RE_ARGS(args) ()
-#if !const && !HAVE_CONST
+
+#ifndef USING_AUTOCONF
+
+#ifndef HAVE_CONST
 #define const
+#else
+#if !HAVE_CONST
+#define const
+#endif
 #endif
+
+#endif /* not USING_AUTOCONF */
+
 #endif /* not __STDC__ */
 
 /* Sets the current default syntax to SYNTAX, and return the old syntax.