diff options
author | Ludovic Courtès <ludo@gnu.org> | 2012-02-03 10:51:46 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2012-02-03 10:51:46 +0100 |
commit | eb4a14ed47a34e03566261b02c77bfcc02b20134 (patch) | |
tree | 23d7e5a0df3aa502b1b5802a0e6c75cfbef87519 /libguile/regex-posix.c | |
parent | 1ba05158ebe033d7d0bdfcfef686eae2c9ea0103 (diff) | |
download | guile-eb4a14ed47a34e03566261b02c77bfcc02b20134.tar.gz |
Use Gnulib's `regex' module.
This should help with regex portability, as reported in
<http://bugs.gnu.org/10684> for Darwin 8.11.
* m4/gnulib-cache.m4 (gl_MODULES): Add `regex'.
* configure.ac: Remove header checks for regex.h, rxposix.h, and
rx/rxposix.h. Remove check for the `regcomp' function. Remove
definition of `HAVE_REGCOMP'. Define `ENABLE_REGEX'.
* libguile/init.c: Check for `ENABLE_REGEX' instead of `HAVE_REGCOMP'.
* libguile/regex-posix.c: Always include <regex.h>. Remove #ifdefs for
rxposix.h and co.
Diffstat (limited to 'libguile/regex-posix.c')
-rw-r--r-- | libguile/regex-posix.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c index 34230994e..bec0f89fb 100644 --- a/libguile/regex-posix.c +++ b/libguile/regex-posix.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004, 2006, 2007, 2010, 2011 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004, 2006, 2007, 2010, 2011, 2012 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -35,23 +35,7 @@ #include "libguile/_scm.h" -/* Supposedly, this file is never compiled unless we know we have - POSIX regular expressions. But we still put this in an #ifdef so - the file is CPP'able (for dependency scanning) even on systems that - don't have a <regex.h> header. */ -#ifdef HAVE_REGCOMP -#ifdef HAVE_REGEX_H #include <regex.h> -#else -#ifdef HAVE_RXPOSIX_H -#include <rxposix.h> /* GNU Rx library */ -#else -#ifdef HAVE_RX_RXPOSIX_H -#include <rx/rxposix.h> /* GNU Rx library on Linux */ -#endif -#endif -#endif -#endif #ifdef HAVE_WCHAR_H #include <wchar.h> |