diff options
| author | 2023-09-19 01:00:37 +0000 | |
|---|---|---|
| committer | 2023-09-19 01:00:37 +0000 | |
| commit | 37a4372f89b597a3c79f141fb9acb9958fa063f4 (patch) | |
| tree | 237fe42e6b30c79a9241014113217bc7f74a1a40 | |
| parent | 058a314f6b569cad02a347c4a8e0946057094cd1 (diff) | |
| parent | 6898fc281ad1ff682693c230d8930485bcf2dc3d (diff) | |
Merge "s/FD_SETFD/F_SETFD/." into main am: a1d5887936 am: f9323e4f88 am: c4dd2d3e8b am: 60cc18b6ab am: 6898fc281a
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2752732
Change-Id: Id52a59186d5941a8a591d0bb7c06edb185aab4bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | include/android/sharedmem.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/android/sharedmem.h b/include/android/sharedmem.h index e0a8045d41..645fa8a5e7 100644 --- a/include/android/sharedmem.h +++ b/include/android/sharedmem.h @@ -53,7 +53,7 @@ extern "C" { /** * Create a shared memory region. * - * Create shared memory region and returns an file descriptor. The resulting file descriptor can be + * Create shared memory region and returns a file descriptor. The resulting file descriptor can be * mmap'ed to process memory space with PROT_READ | PROT_WRITE | PROT_EXEC. Access to shared memory * region can be restricted with {@link ASharedMemory_setProt}. * @@ -65,7 +65,7 @@ extern "C" { * cmsg(3) man pages for more information. * * If you intend to share this file descriptor with a child process after - * calling exec(3), note that you will need to use fcntl(2) with FD_SETFD + * calling exec(3), note that you will need to use fcntl(2) with F_SETFD * to clear the FD_CLOEXEC flag for this to work on all versions of Android. * * Available since API level 26. |