last_patch56 from vodz to simplify copy_file logic

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

diff --git a/libbb/module_syscalls.c b/libbb/module_syscalls.c
index 3a06b21a027c89dd55850ce03869568c55570d6b..cf922f8eb8ca3b930e64e26b92f3515ffc8d693b 100644 (file)
--- a/libbb/module_syscalls.c
+++ b/libbb/module_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
@@ -28,14 +28,17 @@
    _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 __GNU_LIBRARY__ < 5
+#if __GNU_LIBRARY__ < 5 || ((__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1))
 /* These syscalls are not included as part of libc5 */
 _syscall1(int, delete_module, const char *, name);
-_syscall1(int, get_kernel_syms, struct old_kernel_sym *, ks);
+_syscall1(int, get_kernel_syms, __ptr_t, ks);
 
 /* This may have 5 arguments (for old 2.0 kernels) or 2 arguments
  * (for 2.2 and 2.4 kernels).  Use the greatest common denominator,