Patch from Bastian Blank:

[oweals/busybox.git] / libbb / syscalls.c

diff --git a/libbb/syscalls.c b/libbb/syscalls.c
index 2434cb4531251779b33d3020840779128fa55df3..9e89dbd39f8d3b507398106ee854a2a64f45f111 100644 (file)
--- a/libbb/syscalls.c
+++ b/libbb/syscalls.c
@@ -2,8 +2,7 @@
 /*
  * some system calls possibly missing from libc
  *
- * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
- * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,10 +27,6 @@
    _syscall* defined.  */
 #define __LIBRARY__
 #include <sys/syscall.h>
-#if __GNU_LIBRARY__ < 5
-/* This is needed for libc5 */
-#include <asm/unistd.h>
-#endif
 #include "libbb.h"
 
 int sysfs( int option, unsigned int fs_index, char * buf)
@@ -60,9 +55,9 @@ int pivot_root(const char * new_root,const char * put_old)
 
 
 
-#if __GNU_LIBRARY__ < 5 || ((__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1))
+/* These syscalls are not included in ancient glibc versions */
+#if ((__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1))
 
-/* These syscalls are not included as part of libc5 */
 int bdflush(int func, int data)
 {
     return(syscall(__NR_bdflush, func, data));
@@ -97,7 +92,7 @@ int umount2(const char * special_file, int flags)
 }
 
 
-#endif /* __GNU_LIBRARY__ < 5 */
+#endif
 
 
 /* END CODE */