generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am aa916c8d: am c5999c1e: Merge "Clean up SEEK_SET definitions."

Browse Source 
* commit 'aa916c8db85b01389b929f060f232b3e06448e79':
  Clean up SEEK_SET definitions.
This commit is contained in:
Elliott Hughes
2015-02-03 01:31:08 +00:00
committed by Android Git Automerger
parent 4c8a50ba5d aa916c8db8
commit ea31751e4b
2 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libc/include/stdio.h
View File

@@ -207,16 +207,9 @@ extern FILE* stderr;
#define L_tmpnam 1024 /* XXX must be == PATH_MAX */ #define L_tmpnam 1024 /* XXX must be == PATH_MAX */
#define TMP_MAX 308915776 #define TMP_MAX 308915776
/* Always ensure that these are consistent with <fcntl.h> and <unistd.h>! */ #define SEEK_SET 0
#ifndef SEEK_SET #define SEEK_CUR 1
#define SEEK_SET 0 /* set file offset to offset */ #define SEEK_END 2
#endif
#ifndef SEEK_CUR
#define SEEK_CUR 1 /* set file offset to current plus offset */
#endif
#ifndef SEEK_END
#define SEEK_END 2 /* set file offset to EOF plus offset */
#endif
/* /*
* Functions defined in ANSI C standard. * Functions defined in ANSI C standard.

18
libc/include/unistd.h
View File

@@ -35,14 +35,19 @@
#include <sys/select.h> #include <sys/select.h>
#include <sys/sysconf.h> #include <sys/sysconf.h>
#include <machine/posix_limits.h>
__BEGIN_DECLS __BEGIN_DECLS
/* Standard file descriptor numbers. */
#define STDIN_FILENO 0 #define STDIN_FILENO 0
#define STDOUT_FILENO 1 #define STDOUT_FILENO 1
#define STDERR_FILENO 2 #define STDERR_FILENO 2
/* Values for whence in fseek and lseek */ #define F_OK 0
#define X_OK 1
#define W_OK 2
#define R_OK 4
#define SEEK_SET 0 #define SEEK_SET 0
#define SEEK_CUR 1 #define SEEK_CUR 1
#define SEEK_END 2 #define SEEK_END 2
@@ -68,8 +73,6 @@ __BEGIN_DECLS
#define _PC_PRIO_IO 18 #define _PC_PRIO_IO 18
#define _PC_SYNC_IO 19 #define _PC_SYNC_IO 19
#include <machine/posix_limits.h>
extern char** environ; extern char** environ;
extern __noreturn void _exit(int); extern __noreturn void _exit(int);
@@ -121,13 +124,6 @@ extern void endusershell(void);
extern long fpathconf(int, int); extern long fpathconf(int, int);
extern long pathconf(const char*, int); extern long pathconf(const char*, int);
/* Macros for access() */
#define R_OK 4 /* Read */
#define W_OK 2 /* Write */
#define X_OK 1 /* Execute */
#define F_OK 0 /* Existence */
extern int access(const char*, int); extern int access(const char*, int);
extern int faccessat(int, const char*, int, int); extern int faccessat(int, const char*, int, int);
extern int link(const char*, const char*); extern int link(const char*, const char*);