projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge changes from coreutils.
[gnulib.git]
/
lib
/
memmem.c
diff --git
a/lib/memmem.c
b/lib/memmem.c
index
7a6e116
..
04e384c
100644
(file)
--- a/
lib/memmem.c
+++ b/
lib/memmem.c
@@
-1,26
+1,25
@@
/* Copyright (C) 1991,92,93,94,96,97,98,2000,2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
/* Copyright (C) 1991,92,93,94,96,97,98,2000,2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Th
e GNU C Library is free software; you can redistribute it and/or
- 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.
+ Th
is 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.
- Th
e GNU C Library
is distributed in the hope that it will be useful,
+ Th
is program
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU
-
Lesser
General Public License for more details.
+ 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 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. */
+ 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. */
#include <stddef.h>
#include <string.h>
#ifndef _LIBC
#include <stddef.h>
#include <string.h>
#ifndef _LIBC
-# define __builtin_expect(expr, val) (expr)
+# define __builtin_expect(expr, val) (expr)
#endif
#undef memmem
#endif
#undef memmem