From 879165f25a1a6b13995e43c11e88b1a21b6f101e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 8 Aug 2011 13:49:37 -0400 Subject: Avoid multiple definitions of identical scandir cancellation handler --- sysdeps/unix/sysv/linux/i386/scandir64.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sysdeps/unix/sysv/linux/i386') diff --git a/sysdeps/unix/sysv/linux/i386/scandir64.c b/sysdeps/unix/sysv/linux/i386/scandir64.c index 690be813b7..837e1b9438 100644 --- a/sysdeps/unix/sysv/linux/i386/scandir64.c +++ b/sysdeps/unix/sysv/linux/i386/scandir64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2004, 2011 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 @@ -21,6 +21,7 @@ #define SCANDIR __scandir64 #define READDIR __readdir64 #define DIRENT_TYPE struct dirent64 +#define SKIP_SCANDIR_CANCEL 1 #include -- cgit 1.4.1