summaryrefslogtreecommitdiff
path: root/libguile/regex-posix.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-02-08 11:48:08 +0100
committerAndy Wingo <wingo@pobox.com>2012-02-08 11:48:08 +0100
commit0858753e829fd399b55700688b4b2cb9c3ea6908 (patch)
tree55f97b3c1db7a33a181314663cb4e4750077fc3f /libguile/regex-posix.c
parent0aed71aa51e89e714de2392c2a5f44694dca77ea (diff)
parent817307ccac5027fd784798bbbf6ffb52e0a5d751 (diff)
downloadguile-0858753e829fd399b55700688b4b2cb9c3ea6908.tar.gz
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts: GUILE-VERSION libguile/gc-malloc.c libguile/ports.c
Diffstat (limited to 'libguile/regex-posix.c')
-rw-r--r--libguile/regex-posix.c18
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>