Attachment #625808 for bug #713372

View | Details | Raw Unified | Return to bug 713372
Collapse All | Expand All

Lines 31-36 Link Here

(-)a/echo/defs.h (+1 lines)
31	#include <string.h>	31	#include <string.h>
32	#include <wchar.h>	32	#include <wchar.h>
33	#include <unistd.h>	33	#include <unistd.h>
		34	#include <sys/stat.h>
34		35
35	#if defined (__GLIBC__) && defined (_IO_getc_unlocked)	36	#if defined (__GLIBC__) && defined (_IO_getc_unlocked)
36	#undef putchar	37	#undef putchar




#define	getdents(a, b, c)	__getdents64(a, b, c)
#define	dirent	dirent64
extern int	getdents(int, struct dirent *, size_t);
#elif defined	(__dietlibc__)
#include	<dirent.h>
#include	<unistd.h>
#elif defined	(__linux__) || defined (__FreeBSD__) || defined (_AIX) || \
	defined (__NetBSD__) || defined (__OpenBSD__) || \
	defined (__DragonFly__) || defined (__APPLE__)
#include	<dirent.h>
#if !defined (__linux__) || defined(__GLIBC__)
#define	getdents(a, b, c)	getdirentries((a), (char *)(b), (c), &(db->g_offs))
#endif
#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || \
	defined (__DragonFly__) || defined (__APPLE__)
#undef	d_ino
#endif	/* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__
	 || __APPLE__ */
#elif defined	(__dietlibc__)
#include	<dirent.h>
#include	<unistd.h>
#else		/* !__GLIBC__, !__dietlibc__ */
#ifdef	__hpux
#define		_KERNEL

Lines 119-125 static char ifmt_c[] = "-pc-d-b--nl-SD--"; Link Here

(-)a/ls/ls.c (-1 / +3 lines)
119	#include <termcap.h>	119	#include <termcap.h>
120	#endif /* USE_TERMCAP */	120	#endif /* USE_TERMCAP */
121		121
122	#if defined (_AIX) \|\| defined (__GLIBC__)	122	#if defined (_AIX) \|\| \
		123	( defined (__linux__) && !defined(__dietlibc__) && \
		124	!defined(__UCLIBC__) )
123	#include <sys/sysmacros.h>	125	#include <sys/sysmacros.h>
124	#endif	126	#endif
125		127

Lines 31-36 Link Here

(-)a/test/defs.h (-1 / +1 lines)
31	#include <string.h>	31	#include <string.h>
32	#include <wchar.h>	32	#include <wchar.h>
33	#include <unistd.h>	33	#include <unistd.h>
		34	#include <sys/stat.h>
34		35
35	#if defined (__GLIBC__) && defined (_IO_getc_unlocked)	36	#if defined (__GLIBC__) && defined (_IO_getc_unlocked)
36	#undef putchar	37	#undef putchar
37	-

Return to bug 713372

Lines 42-60 Link Here

(-)a/libcommon/getdir.c (-4 / +6 lines)
42	#define getdents(a, b, c) __getdents64(a, b, c)	42	#define getdents(a, b, c) __getdents64(a, b, c)
43	#define dirent dirent64	43	#define dirent dirent64
44	extern int getdents(int, struct dirent *, size_t);	44	extern int getdents(int, struct dirent *, size_t);
45	#elif defined (__GLIBC__) \|\| defined (__FreeBSD__) \|\| defined (_AIX) \|\| \	45	#elif defined (__dietlibc__)
		46	#include <dirent.h>
		47	#include <unistd.h>
		48	#elif defined (__linux__) \|\| defined (__FreeBSD__) \|\| defined (_AIX) \|\| \
46	defined (__NetBSD__) \|\| defined (__OpenBSD__) \|\| \	49	defined (__NetBSD__) \|\| defined (__OpenBSD__) \|\| \
47	defined (__DragonFly__) \|\| defined (__APPLE__)	50	defined (__DragonFly__) \|\| defined (__APPLE__)
48	#include <dirent.h>	51	#include <dirent.h>
		52	#if !defined (__linux__) \|\| defined(__GLIBC__)
49	#define getdents(a, b, c) getdirentries((a), (char *)(b), (c), &(db->g_offs))	53	#define getdents(a, b, c) getdirentries((a), (char *)(b), (c), &(db->g_offs))
		54	#endif
50	#if defined (__FreeBSD__) \|\| defined (__NetBSD__) \|\| defined (__OpenBSD__) \|\| \	55	#if defined (__FreeBSD__) \|\| defined (__NetBSD__) \|\| defined (__OpenBSD__) \|\| \
51	defined (__DragonFly__) \|\| defined (__APPLE__)	56	defined (__DragonFly__) \|\| defined (__APPLE__)
52	#undef d_ino	57	#undef d_ino
53	#endif /* __FreeBSD__ \|\| __NetBSD__ \|\| __OpenBSD__ \|\| __DragonFly__	58	#endif /* __FreeBSD__ \|\| __NetBSD__ \|\| __OpenBSD__ \|\| __DragonFly__
54	\|\| __APPLE__ */	59	\|\| __APPLE__ */
55	#elif defined (__dietlibc__)
56	#include <dirent.h>
57	#include <unistd.h>
58	#else /* !__GLIBC__, !__dietlibc__ */	60	#else /* !__GLIBC__, !__dietlibc__ */
59	#ifdef __hpux	61	#ifdef __hpux
60	#define _KERNEL	62	#define _KERNEL