aboutsummaryrefslogtreecommitdiff
path: root/gcc/fixinc/gnu-regex.c
diff options
context:
space:
mode:
authorBruce Korb <bkorb@gnu.org>2000-12-13 20:07:46 +0000
committerBruce Korb <korbb@gcc.gnu.org>2000-12-13 20:07:46 +0000
commit2629a114242bd12df4b2bad8d9dde5ac2c489a82 (patch)
treeaa77d1e180b5de6f18f88e4ec71062700cc5d417 /gcc/fixinc/gnu-regex.c
parentc36ee1647b48c32193f007fd96f9759865fcba8a (diff)
downloadgcc-2629a114242bd12df4b2bad8d9dde5ac2c489a82.zip
gcc-2629a114242bd12df4b2bad8d9dde5ac2c489a82.tar.gz
gcc-2629a114242bd12df4b2bad8d9dde5ac2c489a82.tar.bz2
Use one makefile for fixinc
From-SVN: r38231
Diffstat (limited to 'gcc/fixinc/gnu-regex.c')
-rw-r--r--gcc/fixinc/gnu-regex.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/gcc/fixinc/gnu-regex.c b/gcc/fixinc/gnu-regex.c
index 4b71a4d..0152e9f 100644
--- a/gcc/fixinc/gnu-regex.c
+++ b/gcc/fixinc/gnu-regex.c
@@ -22,6 +22,8 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+#include "auto-host.h"
+
#undef _GNU_SOURCE
#define _GNU_SOURCE
@@ -76,18 +78,6 @@
# define gettext_noop(String) String
#endif
-/* The `emacs' switch turns on certain matching commands
- that make sense only in Emacs. */
-#ifdef emacs
-
-# include "lisp.h"
-# include "buffer.h"
-# include "syntax.h"
-
-#else /* not emacs */
-
-# include "auto-host.h"
-
# if !defined(volatile) && !defined(HAVE_VOLATILE)
# define volatile
# endif
@@ -191,8 +181,6 @@ init_syntax_once ()
# endif /* not SYNTAX_TABLE */
# define SYNTAX(c) re_syntax_table[c]
-
-#endif /* not emacs */
/* Get the interface, including the syntax bits. */
/* GCC LOCAL: call it gnu-regex.h, not regex.h, to avoid name conflicts */
@@ -922,7 +910,7 @@ printchar (c)
syntax, so it can be changed between regex compilations. */
/* This has no initializer because initialized variables in Emacs
become read-only after dumping. */
-static reg_syntax_t re_syntax_options;
+reg_syntax_t re_syntax_options;
/* Specify the precise syntax of regexps for compilation. This provides
@@ -5710,6 +5698,7 @@ regerror (errcode, preg, errbuf, errbuf_size)
{
const char *msg;
size_t msg_size;
+ (void)preg;
if (errcode < 0
|| errcode >= (int) (sizeof (re_error_msgid)