diff options
| author | dj <dj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-18 23:40:00 +0000 |
|---|---|---|
| committer | dj <dj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-07-18 23:40:00 +0000 |
| commit | b92e80dba9bfe0f8c56380bff5fe386f04d5182e (patch) | |
| tree | 82716a6a38136f5525d3abd0f0f429d628c132b3 /include | |
| parent | caa9e377d4a1907cb811b601a44723c4f336fdca (diff) | |
| download | gcc-b92e80dba9bfe0f8c56380bff5fe386f04d5182e.tar.gz | |
merge from glibc
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44138 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 4 | ||||
| -rw-r--r-- | include/xregex2.h | 17 |
2 files changed, 12 insertions, 9 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 096599e7827..54e7051021f 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,7 @@ +2001-07-18 Andreas Jaeger <aj@suse.de> + + * xregex2.h: Place under LGPL version 2.1. + 2001-07-10 Jeff Johnston <jjohnstn@redhat.com> * xregex.h: New file to support libiberty regex. diff --git a/include/xregex2.h b/include/xregex2.h index 63c2fef6967..b9c2d97cce1 100644 --- a/include/xregex2.h +++ b/include/xregex2.h @@ -1,24 +1,23 @@ /* Definitions for data structures and routines for the regular expression library, version 0.12. Copyright (C) 1985,1989-1993,1995-1998, 2000 Free Software Foundation, Inc. - This file is part of the GNU C Library. Its master source is NOT part of the C library, however. The master source lives in /gd/gnu/lib. The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. The GNU C Library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ #ifndef _REGEX_H #define _REGEX_H 1 |