projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests for module 'ftell'.
[gnulib.git]
/
lib
/
readtokens.c
diff --git
a/lib/readtokens.c
b/lib/readtokens.c
index
2ccf6a9
..
28aafa9
100644
(file)
--- a/
lib/readtokens.c
+++ b/
lib/readtokens.c
@@
-1,5
+1,6
@@
/* readtokens.c -- Functions for reading tokens from an input stream.
/* readtokens.c -- Functions for reading tokens from an input stream.
- Copyright (C) 1990-1991, 1999-2004 Free Software Foundation, Inc.
+
+ Copyright (C) 1990-1991, 1999-2004, 2006 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
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
@@
-13,7
+14,7
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA.
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA.
Written by Jim Meyering. */
Written by Jim Meyering. */
@@
-21,9
+22,7
@@
gives the same functionality, except that these functions
would never return empty lines. */
gives the same functionality, except that these functions
would never return empty lines. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "readtokens.h"
#include "readtokens.h"
@@
-32,9
+31,12
@@
#include <string.h>
#include <stdbool.h>
#include <string.h>
#include <stdbool.h>
-#include "unlocked-io.h"
#include "xalloc.h"
#include "xalloc.h"
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
#define STREQ(a,b) ((a) == (b) || ((a) && (b) && *(a) == *(b) \
&& strcmp(a, b) == 0))
#define STREQ(a,b) ((a) == (b) || ((a) && (b) && *(a) == *(b) \
&& strcmp(a, b) == 0))