X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fregex.c;h=af47056d73d2a54cf77657182de704a8d438ce97;hb=204966e4dadc046098cb5deea7031e307028ad7f;hp=1bfdd6b9cf9473ac930e08c74b93c3e8d3bf8316;hpb=f58f44a2f9c2e9b8fc9ea2ca910bd070d1f8bd48;p=gnulib.git

diff --git a/lib/regex.c b/lib/regex.c
index 1bfdd6b9c..af47056d7 100644
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -17,8 +17,11 @@
    with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
+
+/* Make sure noone compiles this code with a C++ compiler.  */
+#if defined __cplusplus && defined _LIBC
+# error "This is C code, use a C compiler"
 #endif
 
 #ifdef _LIBC
@@ -50,6 +53,7 @@
    GNU regex allows.  Include it before <regex.h>, which correctly
    #undefs RE_DUP_MAX and sets it to the right value.  */
 #include <limits.h>
+#include <strings.h>
 
 #include <regex.h>
 #include "regex_internal.h"