From: Roland McGrath <roland@gnu.org>
Date: Fri, 1 Oct 2004 22:49:36 +0000 (+0000)
Subject: [BZ #420]
X-Git-Tag: cvs/fedora-glibc-20041004T0747~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=290855f36b15fe306c281794a0ec56f56959f94c;p=thirdparty%2Fglibc.git

[BZ #420]

2004-10-02  Simon Josefsson  <jas@extundo.com>
	[BZ #420]
	* sysdeps/generic/memmem.c [!_LIBC]: Define __builtin_expect, to
	make the file usable inside gnulib.
---

diff --git a/sysdeps/generic/memmem.c b/sysdeps/generic/memmem.c
index 9e27548dd5f..c40462104a9 100644
--- a/sysdeps/generic/memmem.c
+++ b/sysdeps/generic/memmem.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,94,96,97,98,2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,96,97,98,2000,2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -19,6 +19,10 @@
 #include <stddef.h>
 #include <string.h>
 
+#ifndef _LIBC
+# define __builtin_expect(expr, val)   (expr)
+#endif
+
 #undef memmem
 
 /* Return the first occurrence of NEEDLE in HAYSTACK.  */