Merge __USE_BSD/__USE_GNU with following api level checks.
Change-Id: I65301f091195ebb0f977567d4de1dec50efc4e67
diff --git a/libc/include/sys/sem.h b/libc/include/sys/sem.h
index 9274b90..c01603a 100644
--- a/libc/include/sys/sem.h
+++ b/libc/include/sys/sem.h
@@ -63,10 +63,8 @@
int semop(int __sem_id, struct sembuf* _Nonnull __ops, size_t __op_count) __INTRODUCED_IN(26);
#endif /* __BIONIC_AVAILABILITY_GUARD(26) */
-#if defined(__USE_GNU)
-#if __BIONIC_AVAILABILITY_GUARD(26)
+#if defined(__USE_GNU) && __BIONIC_AVAILABILITY_GUARD(26)
int semtimedop(int __sem_id, struct sembuf* _Nonnull __ops, size_t __op_count, const struct timespec* _Nullable __timeout) __INTRODUCED_IN(26);
-#endif /* __BIONIC_AVAILABILITY_GUARD(26) */
#endif
__END_DECLS