am f7fe3ca6: Merge "Deprecate __set_errno; Add #include <stdint.h> in elf.h"

* commit 'f7fe3ca6dece533962046712269b443d4e6a3d87':
  Deprecate __set_errno; Add #include <stdint.h> in elf.h
This commit is contained in:
Andrew Hsieh
2013-03-27 11:09:05 -07:00
committed by Android Git Automerger
8 changed files with 9 additions and 10 deletions

View File

@@ -241,7 +241,6 @@ __rt_sigaction
__rt_sigprocmask __rt_sigprocmask
__rt_sigtimedwait __rt_sigtimedwait
__sclose __sclose
__set_errno
__set_syscall_errno __set_syscall_errno
__set_tls __set_tls
__sflags __sflags

View File

@@ -52,6 +52,7 @@ enum {
AT_SECURE = 23 AT_SECURE = 23
}; };
#include <stdint.h>
#include <sys/exec_elf.h> #include <sys/exec_elf.h>
typedef struct { typedef struct {

View File

@@ -40,16 +40,20 @@ __BEGIN_DECLS
#define ENOTSUP EOPNOTSUPP #define ENOTSUP EOPNOTSUPP
#endif #endif
/* internal function that should *only* be called from system calls */
/* use errno = xxxx instead in C code */
extern int __set_errno(int error);
/* internal function returning the address of the thread-specific errno */ /* internal function returning the address of the thread-specific errno */
extern volatile int* __errno(void); extern volatile int* __errno(void);
/* a macro expanding to the errno l-value */ /* a macro expanding to the errno l-value */
#define errno (*__errno()) #define errno (*__errno())
/* internal function that should *only* be called from system calls */
/* use errno = xxxx instead in C code */
static __inline__ int __attribute__((deprecated))
__set_errno(int n) {
errno = n;
return -1;
}
__END_DECLS __END_DECLS
#endif /* _ERRNO_H */ #endif /* _ERRNO_H */

View File

@@ -273,7 +273,6 @@ __rt_sigaction
__rt_sigprocmask __rt_sigprocmask
__rt_sigtimedwait __rt_sigtimedwait
__sclose __sclose
__set_errno
__set_syscall_errno __set_syscall_errno
__set_tls __set_tls
__sflags __sflags

View File

@@ -284,7 +284,6 @@ __rt_sigaction
__rt_sigprocmask __rt_sigprocmask
__rt_sigtimedwait __rt_sigtimedwait
__sclose __sclose
__set_errno
__set_syscall_errno __set_syscall_errno
__set_tls __set_tls
__setresuid __setresuid

View File

@@ -288,7 +288,6 @@ __rt_sigaction
__rt_sigprocmask __rt_sigprocmask
__rt_sigtimedwait __rt_sigtimedwait
__sclose __sclose
__set_errno
__set_syscall_errno __set_syscall_errno
__set_tls __set_tls
__setresuid __setresuid

View File

@@ -159,7 +159,6 @@ __rt_sigaction
__rt_sigprocmask __rt_sigprocmask
__rt_sigtimedwait __rt_sigtimedwait
__sclose __sclose
__set_errno
__set_syscall_errno __set_syscall_errno
__set_thread_area __set_thread_area
__set_tls __set_tls

View File

@@ -155,7 +155,6 @@ __rt_sigaction
__rt_sigprocmask __rt_sigprocmask
__rt_sigtimedwait __rt_sigtimedwait
__sclose __sclose
__set_errno
__set_syscall_errno __set_syscall_errno
__set_thread_area __set_thread_area
__set_tls __set_tls