last_patch56 from vodz to simplify copy_file logic

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

diff --git a/libbb/syscalls.c b/libbb/syscalls.c
index 4a846eb005d2548d7a74b492b66770ff2cd9401f..76b77f816b578f7d806a32b479d17d6a8faa06b7 100644 (file)
--- a/libbb/syscalls.c
+++ b/libbb/syscalls.c
@@ -2,8 +2,8 @@
 /*
  * some system calls possibly missing from libc
  *
- * Copyright (C) 1999,2000,2001 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
+ * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.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
@@ -27,10 +27,11 @@
 /* Kernel headers before 2.1.mumble need this on the Alpha to get
    _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"
 
 #if defined(__ia64__)
@@ -71,7 +72,7 @@ int pivot_root(const char * new_root,const char * put_old)
 
 
 
-#if __GNU_LIBRARY__ < 5
+#if __GNU_LIBRARY__ < 5 || ((__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1))
 /* These syscalls are not included as part of libc5 */
 _syscall2(int, bdflush, int, func, int, data);