Revert "Update gnulib to current upstream master"

[external/binutils.git] / gdb / gnulib / import / memmem.c

diff --git a/gdb/gnulib/import/memmem.c b/gdb/gnulib/import/memmem.c
index 260848d..7d1f971 100644 (file)
--- a/gdb/gnulib/import/memmem.c
+++ b/gdb/gnulib/import/memmem.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2018 Free Software
+/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2016 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -13,7 +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, see <https://www.gnu.org/licenses/>.  */
+   with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 /* This particular implementation was written by Eric Blake, 2008.  */
 
@@ -24,6 +24,10 @@
 /* Specification of memmem.  */
 #include <string.h>
 
+#ifndef _LIBC
+# define __builtin_expect(expr, val)   (expr)
+#endif
+
 #define RETURN_TYPE void *
 #define AVAILABLE(h, h_l, j, n_l) ((j) <= (h_l) - (n_l))
 #include "str-two-way.h"