public inbox for glibc-bugs@sourceware.org
help / color / mirror / Atom feed
* [Bug libc/420] New: memmem.c fix to permit use in gnulib
@ 2004-10-01 22:12 simon at josefsson dot org
2004-10-01 22:49 ` [Bug libc/420] " cvs-commit at gcc dot gnu dot org
2004-10-01 22:50 ` roland at gnu dot org
0 siblings, 2 replies; 3+ messages in thread
From: simon at josefsson dot org @ 2004-10-01 22:12 UTC (permalink / raw)
To: glibc-bugs
The following patch would make it possible to share memmem.c between gnulib and
GLIBC.
2004-10-02 Simon Josefsson <jas@extundo.com>
* sysdeps/generic/memmem.c [!_LIBC]: Define __builtin_expect, to
make the file usable inside gnulib.
Index: memmem.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/generic/memmem.c,v
retrieving revision 1.12
diff -u -p -r1.12 memmem.c
--- memmem.c 6 Jul 2001 04:55:49 -0000 1.12
+++ memmem.c 1 Oct 2004 22:10:39 -0000
@@ -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. */
--
Summary: memmem.c fix to permit use in gnulib
Product: glibc
Version: unspecified
Status: NEW
Severity: enhancement
Priority: P2
Component: libc
AssignedTo: gotom at debian dot or dot jp
ReportedBy: simon at josefsson dot org
CC: glibc-bugs at sources dot redhat dot com
http://sources.redhat.com/bugzilla/show_bug.cgi?id=420
------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Bug libc/420] memmem.c fix to permit use in gnulib
2004-10-01 22:12 [Bug libc/420] New: memmem.c fix to permit use in gnulib simon at josefsson dot org
@ 2004-10-01 22:49 ` cvs-commit at gcc dot gnu dot org
2004-10-01 22:50 ` roland at gnu dot org
1 sibling, 0 replies; 3+ messages in thread
From: cvs-commit at gcc dot gnu dot org @ 2004-10-01 22:49 UTC (permalink / raw)
To: glibc-bugs
------- Additional Comments From cvs-commit at gcc dot gnu dot org 2004-10-01 22:49 -------
Subject: Bug 420
CVSROOT: /cvs/glibc
Module name: libc
Changes by: roland@sources.redhat.com 2004-10-01 22:49:37
Modified files:
sysdeps/generic: memmem.c
Log message:
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.
Patches:
http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/sysdeps/generic/memmem.c.diff?cvsroot=glibc&r1=1.12&r2=1.13
--
http://sources.redhat.com/bugzilla/show_bug.cgi?id=420
------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Bug libc/420] memmem.c fix to permit use in gnulib
2004-10-01 22:12 [Bug libc/420] New: memmem.c fix to permit use in gnulib simon at josefsson dot org
2004-10-01 22:49 ` [Bug libc/420] " cvs-commit at gcc dot gnu dot org
@ 2004-10-01 22:50 ` roland at gnu dot org
1 sibling, 0 replies; 3+ messages in thread
From: roland at gnu dot org @ 2004-10-01 22:50 UTC (permalink / raw)
To: glibc-bugs
------- Additional Comments From roland at gnu dot org 2004-10-01 22:50 -------
Fixed in cvs.
--
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |RESOLVED
Resolution| |FIXED
http://sources.redhat.com/bugzilla/show_bug.cgi?id=420
------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2004-10-01 22:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-10-01 22:12 [Bug libc/420] New: memmem.c fix to permit use in gnulib simon at josefsson dot org
2004-10-01 22:49 ` [Bug libc/420] " cvs-commit at gcc dot gnu dot org
2004-10-01 22:50 ` roland at gnu dot org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).