use guile eval for elisp tree-il

[bpt/guile.git] / libguile / regex-posix.c

diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c
index 4c03577..bec0f89 100644 (file)
--- 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 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>
@@ -228,12 +212,12 @@ fixup_multibyte_match (regmatch_t *matches, int nmatches, char *str)
         }
 
       nbytes = mbrlen (str + byte_idx, MB_LEN_MAX, &state);
+      if (nbytes == (size_t) -2 || nbytes == (size_t) -1)
+        /* Something is wrong. Shouldn't be possible, as the regex match
+           succeeded.  */
+        abort ();
     }
 
-  if (nbytes >= (size_t) -2)
-    /* Something is wrong. Shouldn't be possible, as the regex match
-       succeeded.  */
-    abort ();
 }
 #endif