syscall() declaration belongs in unistd.h, not sys/syscall.h

traditionally, both BSD and GNU systems have it this way.
sys/syscall.h is purely syscall number macros. presently glibc exposes
the syscall declaration in unistd.h only with _GNU_SOURCE, but that
does not reflect historical practice.

diff --git a/include/sys/syscall.h b/include/sys/syscall.h
index af3ca46..24987dd 100644 (file)
--- a/include/sys/syscall.h
+++ b/include/sys/syscall.h
@@ -1,16 +1,6 @@
 #ifndef _SYS_SYSCALL_H
 #define _SYS_SYSCALL_H
 #ifndef _SYS_SYSCALL_H
 #define _SYS_SYSCALL_H

-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <features.h>
-
-long syscall(long, ...);

 
 #include <bits/syscall.h>
 
 
 #include <bits/syscall.h>
 

-#ifdef __cplusplus
-}
-#endif

 #endif
 #endif

diff --git a/include/unistd.h b/include/unistd.h
index 64a6b46..89015ad 100644 (file)
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -175,6 +175,7 @@ void setusershell(void);
 void endusershell(void);
 char *getusershell(void);
 int acct(const char *);
 void endusershell(void);
 char *getusershell(void);
 int acct(const char *);

+long syscall(long, ...);

 #endif
 
 #ifdef _GNU_SOURCE
 #endif
 
 #ifdef _GNU_SOURCE