* dwarf2read.c (macro_start_file): Update.

[deliverable/binutils-gdb.git] / gdb / gdb_regex.h

diff --git a/gdb/gdb_regex.h b/gdb/gdb_regex.h
index 09aaf0862d86dc8f478609d80af281b3464da59d..46485ed221dfe98a4cd67b43036a5f6bcc52b561 100644 (file)
--- a/gdb/gdb_regex.h
+++ b/gdb/gdb_regex.h
@@ -1,11 +1,12 @@
-/* Portable <regex.h>
-   Copyright 2000 Free Software Foundation, Inc.
+/* Portable <regex.h>.
+   Copyright (C) 2000-2001, 2003, 2007-2012 Free Software Foundation,
+   Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -14,15 +15,21 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef GDB_REGEX_H
+#define GDB_REGEX_H 1
 
-#ifndef _GDB_REGEX_H
-#define _GDB_REGEX_H
 #ifdef USE_INCLUDED_REGEX
-#include "gnu-regex.h"
+# include "xregex.h"
 #else
-#include <regex.h>
+/* Request 4.2 BSD regex functions.  */
+# define _REGEX_RE_COMP
+# include <regex.h>
 #endif
-#endif /* _GDB_REGEX_H */
+
+/* From utils.c.  */
+struct cleanup *make_regfree_cleanup (regex_t *);
+char *get_regcomp_error (int, regex_t *);
+
+#endif /* not GDB_REGEX_H */