From d2ee815ad677bba720c4f0275c1d6065f5809e7a Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Wed, 13 May 2015 12:34:11 -0700
Subject: Refactor scandir/scandirat to use common tail.

---
 sysdeps/unix/sysv/linux/i386/scandir64.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'sysdeps')

diff --git a/sysdeps/unix/sysv/linux/i386/scandir64.c b/sysdeps/unix/sysv/linux/i386/scandir64.c
index 824bf84..8629078 100644
--- a/sysdeps/unix/sysv/linux/i386/scandir64.c
+++ b/sysdeps/unix/sysv/linux/i386/scandir64.c
@@ -17,22 +17,21 @@
 
 #include <dirent.h>
 
-#define SCANDIR __scandir64
-#define SCANDIRAT scandirat64
-#define READDIR __readdir64
-#define DIRENT_TYPE struct dirent64
+#define SCANDIR		__scandir64
+#define SCANDIR_TAIL	__scandir64_tail
+#define DIRENT_TYPE	struct dirent64
 
 #include <dirent/scandir.c>
 
-#undef SCANDIR
-#undef READDIR
-#undef DIRENT_TYPE
+#undef	SCANDIR
+#undef	SCANDIR_TAIL
+#undef	DIRENT_TYPE
 
 #include <shlib-compat.h>
 
 versioned_symbol (libc, __scandir64, scandir64, GLIBC_2_2);
 
-#if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2)
+#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_2)
 # include <string.h>
 # include <errno.h>
 # include "olddirent.h"
-- 
cgit v1.1