diff options
author | Jakub Jelinek <jakub@redhat.com> | 2004-10-04 08:56:18 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2004-10-04 08:56:18 +0000 |
commit | 85148842d401edf64f9edee7e5819a947c289ed2 (patch) | |
tree | 42f228e998070f60c3bdb2018c9921b221a6851b /sysdeps | |
parent | 6d96590587deec027c04fe576f11cff0f445eb32 (diff) |
Updated to fedora-glibc-20041004T0747cvs/fedora-glibc-2_3_3-64
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/generic/memmem.c | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/sysdeps/generic/memmem.c b/sysdeps/generic/memmem.c index 9e27548dd5..c40462104a 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. */ diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index f83463738d..fd089dd236 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -150,3 +150,7 @@ ifeq ($(subdir),rt) CFLAGS-mq_send.c += -fexceptions CFLAGS-mq_receive.c += -fexceptions endif + +ifeq ($(subdir),nscd) +CFLAGS-connections.c += -DHAVE_EPOLL +endif |