Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37a4372f authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "s/FD_SETFD/F_SETFD/." into main am: a1d58879 am: f9323e4f am:... 

Merge "s/FD_SETFD/F_SETFD/." into main am: a1d58879 am: f9323e4f am: c4dd2d3e am: 60cc18b6 am: 6898fc28

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2752732



Change-Id: Id52a59186d5941a8a591d0bb7c06edb185aab4bd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 058a314f 6898fc28

include/android/sharedmem.h

+2 −2
Original line number Diff line number Diff line
@@ -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.