X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrtok_r.c;h=f7e0e63e515d333198ae12d6d6d73e4ce7c8cd8e;hb=e9b552cf52b6200633c335b19a2f703f72f8683a;hp=d1522c9b51c55f3636662d3a6759bc121baed7ae;hpb=267a39bafd249d7eb9c37df06dc6defcf41cb343;p=gnulib.git diff --git a/lib/strtok_r.c b/lib/strtok_r.c index d1522c9b5..f7e0e63e5 100644 --- a/lib/strtok_r.c +++ b/lib/strtok_r.c @@ -1,20 +1,19 @@ /* Reentrant string tokenizer. Generic version. - Copyright (C) 1991,1996-1999,2001,2004 Free Software Foundation, Inc. + Copyright (C) 1991,1996-1999,2001,2004,2007,2009 Free Software Foundation, Inc. This file is part of the GNU C Library. - This program is free software; you can redistribute it and/or modify + 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, or (at your option) - any later version. + 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, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ #ifdef HAVE_CONFIG_H # include @@ -22,12 +21,10 @@ #include -#undef strtok_r -#undef __strtok_r - -#ifndef _LIBC -/* Get specification. */ -# include "strtok_r.h" +#ifdef _LIBC +# undef strtok_r +# undef __strtok_r +#else # define __strtok_r strtok_r # define __rawmemchr strchr #endif