Merge "Remove <sys/stat.h> inlines for obsolete API levels."

This commit is contained in:
Elliott Hughes 2023-02-24 19:23:15 +00:00 committed by Gerrit Code Review
commit f5e899d84d
2 changed files with 0 additions and 52 deletions

View file

@ -1,45 +0,0 @@
/*
* Copyright (C) 2015 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#pragma once
#include <sys/cdefs.h>
#if __ANDROID_API__ < 21
#include <sys/stat.h>
__BEGIN_DECLS
static __inline int mkfifo(const char* __path, mode_t __mode) {
return mknod(__path, (__mode & ~S_IFMT) | S_IFIFO, (dev_t)0);
}
__END_DECLS
#endif

View file

@ -156,12 +156,7 @@ mode_t umask(mode_t __mask);
#include <bits/fortify/stat.h>
#endif
#if __ANDROID_API__ >= 21
int mkfifo(const char* _Nonnull __path, mode_t __mode) __INTRODUCED_IN(21);
#else
// Implemented as a static inline before 21.
#endif
int mkfifoat(int __dir_fd, const char* _Nonnull __path, mode_t __mode) __INTRODUCED_IN(23);
int fchmodat(int __dir_fd, const char* _Nonnull __path, mode_t __mode, int __flags);
@ -223,5 +218,3 @@ int statx(int __dir_fd, const char* _Nonnull __path, int __flags, unsigned __mas
#endif
__END_DECLS
#include <android/legacy_sys_stat_inlines.h>