From aded5309ba1bb9e7e671adb060f8ee81882a3a12 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 4 Apr 2006 21:56:13 +0000 Subject: [PATCH] Remove exception grant from lib/x*c files. Don't build xstrdup. --- lib/ChangeLog | 4 ++++ lib/Makefile.am | 2 +- lib/xmalloc.c | 23 ----------------------- lib/xstrdup.c | 23 ----------------------- lib/xstrndup.c | 23 ----------------------- 5 files changed, 5 insertions(+), 70 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index f7760f1..cc2850c 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2006-04-04 Ulrich Drepper + + * Makefile.am (libeu_a_SOURCES): We don't need xstrdup in the moment. + 2005-08-28 Ulrich Drepper * system.h: Define pwrite_retry, write_retry, and pread_retry. diff --git a/lib/Makefile.am b/lib/Makefile.am index fbe119d..7a30a92 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -35,7 +35,7 @@ INCLUDES = -I$(srcdir)/../libelf -I.. noinst_LIBRARIES = libeu.a -libeu_a_SOURCES = xstrdup.c xstrndup.c xmalloc.c next_prime.c \ +libeu_a_SOURCES = xstrndup.c xmalloc.c next_prime.c \ crc32.c crc32_file.c noinst_HEADERS = fixedsizehash.h system.h dynamicsizehash.h list.h diff --git a/lib/xmalloc.c b/lib/xmalloc.c index f5cda65..ec3b754 100644 --- a/lib/xmalloc.c +++ b/lib/xmalloc.c @@ -15,29 +15,6 @@ with Red Hat elfutils; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - In addition, as a special exception, Red Hat, Inc. gives You the - additional right to link the code of Red Hat elfutils with code licensed - under an Open Source Initiative certified open source license - (http://www.opensource.org/licenses/index.php) and to distribute linked - combinations including the two. Non-GPL Code permitted under this - exception must only link to the code of Red Hat elfutils through those - well defined interfaces identified in the file named EXCEPTION found in - the source code files (the "Approved Interfaces"). The files of Non-GPL - Code may instantiate templates or use macros or inline functions from - the Approved Interfaces without causing the resulting work to be covered - by the GNU General Public License. Only Red Hat, Inc. may make changes - or additions to the list of Approved Interfaces. Red Hat's grant of - this exception is conditioned upon your not adding any new exceptions. - If you wish to add a new Approved Interface or exception, please contact - Red Hat. You must obey the GNU General Public License in all respects - for all of the Red Hat elfutils code and other code used in conjunction - with Red Hat elfutils except the Non-GPL Code covered by this exception. - If you modify this file, you may extend this exception to your version - of the file, but you are not obligated to do so. If you do not wish to - provide this exception without modification, you must delete this - exception statement from your version and license this file solely under - the GPL without exception. - Red Hat elfutils is an included package of the Open Invention Network. An included package of the Open Invention Network is a package for which Open Invention Network licensees cross-license their patents. No patent diff --git a/lib/xstrdup.c b/lib/xstrdup.c index 5eb1f46..f529084 100644 --- a/lib/xstrdup.c +++ b/lib/xstrdup.c @@ -15,29 +15,6 @@ with Red Hat elfutils; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - In addition, as a special exception, Red Hat, Inc. gives You the - additional right to link the code of Red Hat elfutils with code licensed - under an Open Source Initiative certified open source license - (http://www.opensource.org/licenses/index.php) and to distribute linked - combinations including the two. Non-GPL Code permitted under this - exception must only link to the code of Red Hat elfutils through those - well defined interfaces identified in the file named EXCEPTION found in - the source code files (the "Approved Interfaces"). The files of Non-GPL - Code may instantiate templates or use macros or inline functions from - the Approved Interfaces without causing the resulting work to be covered - by the GNU General Public License. Only Red Hat, Inc. may make changes - or additions to the list of Approved Interfaces. Red Hat's grant of - this exception is conditioned upon your not adding any new exceptions. - If you wish to add a new Approved Interface or exception, please contact - Red Hat. You must obey the GNU General Public License in all respects - for all of the Red Hat elfutils code and other code used in conjunction - with Red Hat elfutils except the Non-GPL Code covered by this exception. - If you modify this file, you may extend this exception to your version - of the file, but you are not obligated to do so. If you do not wish to - provide this exception without modification, you must delete this - exception statement from your version and license this file solely under - the GPL without exception. - Red Hat elfutils is an included package of the Open Invention Network. An included package of the Open Invention Network is a package for which Open Invention Network licensees cross-license their patents. No patent diff --git a/lib/xstrndup.c b/lib/xstrndup.c index b8d2ec8..312f5e2 100644 --- a/lib/xstrndup.c +++ b/lib/xstrndup.c @@ -15,29 +15,6 @@ with Red Hat elfutils; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - In addition, as a special exception, Red Hat, Inc. gives You the - additional right to link the code of Red Hat elfutils with code licensed - under an Open Source Initiative certified open source license - (http://www.opensource.org/licenses/index.php) and to distribute linked - combinations including the two. Non-GPL Code permitted under this - exception must only link to the code of Red Hat elfutils through those - well defined interfaces identified in the file named EXCEPTION found in - the source code files (the "Approved Interfaces"). The files of Non-GPL - Code may instantiate templates or use macros or inline functions from - the Approved Interfaces without causing the resulting work to be covered - by the GNU General Public License. Only Red Hat, Inc. may make changes - or additions to the list of Approved Interfaces. Red Hat's grant of - this exception is conditioned upon your not adding any new exceptions. - If you wish to add a new Approved Interface or exception, please contact - Red Hat. You must obey the GNU General Public License in all respects - for all of the Red Hat elfutils code and other code used in conjunction - with Red Hat elfutils except the Non-GPL Code covered by this exception. - If you modify this file, you may extend this exception to your version - of the file, but you are not obligated to do so. If you do not wish to - provide this exception without modification, you must delete this - exception statement from your version and license this file solely under - the GPL without exception. - Red Hat elfutils is an included package of the Open Invention Network. An included package of the Open Invention Network is a package for which Open Invention Network licensees cross-license their patents. No patent -- 2.7.4