mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-16 16:50:21 +02:00
Code Activity

Use Gnulib's `regex' module.

Browse source 
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.
This commit is contained in:
Ludovic Courtès 2012-02-03 10:51:46 +01:00
parent 1ba05158eb
commit eb4a14ed47
40 changed files with 16040 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libguile/regex-posix.c
View file

@ -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>