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

am 1084911f: am 40d06b25: Merge "POSIX says flock is in <sys/file.h>, not <unistd.h>."

Browse Source 
* commit '1084911fc297b262600a5caed9a94d6ddde7cc66':
  POSIX says flock is in <sys/file.h>, not <unistd.h>.
This commit is contained in:
Elliott Hughes 2015-02-17 17:23:26 +00:00 committed by Android Git Automerger
commit ea3fe53ac5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libc/include/sys/file.h
View File

@ -25,14 +25,19 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef _SYS_FILE_H_ #ifndef _SYS_FILE_H_
#define _SYS_FILE_H_ #define _SYS_FILE_H_
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <sys/types.h> #include <sys/types.h>
/* ANDROID: needed for flock() */
#include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
__BEGIN_DECLS
int flock(int, int);
__END_DECLS
#endif /* _SYS_FILE_H_ */ #endif /* _SYS_FILE_H_ */

1
libc/include/unistd.h
View File

@ -168,7 +168,6 @@ extern int dup2(int, int);
extern int dup3(int, int, int); extern int dup3(int, int, int);
extern int fcntl(int, int, ...); extern int fcntl(int, int, ...);
extern int ioctl(int, int, ...); extern int ioctl(int, int, ...);
extern int flock(int, int);
extern int fsync(int); extern int fsync(int);
extern int fdatasync(int); extern int fdatasync(int);
extern int ftruncate(int, off_t); extern int ftruncate(int, off_t);