X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Freadtokens.c;h=01750989cca2b19945ff910e8a12ddd0585b8383;hb=d93391bffb3c76c651161b5b8c199c358bc6256a;hp=2ccf6a9380cd159013e8dfab376e5ade6fc8e78d;hpb=a62be9f4039b4499cfbb76e394cad2259d03fa84;p=gnulib.git
diff --git a/lib/readtokens.c b/lib/readtokens.c
index 2ccf6a938..01750989c 100644
--- a/lib/readtokens.c
+++ b/lib/readtokens.c
@@ -1,10 +1,11 @@
/* readtokens.c -- Functions for reading tokens from an input stream.
- Copyright (C) 1990-1991, 1999-2004 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1990-1991, 1999-2004, 2006, 2009 Free Software Foundation, Inc.
+
+ 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
@@ -12,8 +13,7 @@
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 .
Written by Jim Meyering. */
@@ -21,9 +21,7 @@
gives the same functionality, except that these functions
would never return empty lines. */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
#include "readtokens.h"
@@ -32,11 +30,11 @@
#include
#include
-#include "unlocked-io.h"
#include "xalloc.h"
-#define STREQ(a,b) ((a) == (b) || ((a) && (b) && *(a) == *(b) \
- && strcmp(a, b) == 0))
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
/* Initialize a tokenbuffer. */