From acb60779883f4f11280985a8cd286a27d4bee922 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 7 Apr 2017 07:30:52 -0600
Subject: [PATCH] Remove CONFIG_PTHREAD_RWLOCK.  Rwlock interfaces built
 unconditionally.

---
 examples/ostest/Makefile      | 5 +----
 examples/ostest/ostest_main.c | 6 ++----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/examples/ostest/Makefile b/examples/ostest/Makefile
index 6d7df2923..5006623fd 100644
--- a/examples/ostest/Makefile
+++ b/examples/ostest/Makefile
@@ -71,6 +71,7 @@ endif
 
 ifneq ($(CONFIG_DISABLE_PTHREAD),y)
 CSRCS += cancel.c cond.c mutex.c sem.c semtimed.c barrier.c timedwait.c
+CSRCS += pthread_rwlock.c
 
 ifneq ($(CONFIG_PTHREAD_MUTEX_UNSAFE),y)
 CSRCS += robust.c
@@ -93,10 +94,6 @@ CSRCS += sporadic.c
 endif
 endif # CONFIG_DISABLE_PTHREAD
 
-ifeq ($(CONFIG_PTHREAD_RWLOCK),y)
-CSRCS += pthread_rwlock.c
-endif
-
 ifneq ($(CONFIG_DISABLE_MQUEUE),y)
 ifneq ($(CONFIG_DISABLE_PTHREAD),y)
 CSRCS += mqueue.c timedmqueue.c
diff --git a/examples/ostest/ostest_main.c b/examples/ostest/ostest_main.c
index dda6579d7..d623d8482 100644
--- a/examples/ostest/ostest_main.c
+++ b/examples/ostest/ostest_main.c
@@ -424,15 +424,13 @@ static int user_main(int argc, char *argv[])
       cond_test();
       check_test_memory_usage();
 #endif
-#endif
 
-#ifdef CONFIG_PTHREAD_RWLOCK
-      /* Verify pthreads and pthread mutex */
+      /* Verify pthreads rwlock interfaces */
 
       printf("\nuser_main: pthread_rwlock test\n");
       pthread_rwlock_test();
       check_test_memory_usage();
-#endif /* CONFIG_PTHREAD_RWLOCK */
+#endif /* !CONFIG_DISABLE_PTHREAD */
 
 #ifndef CONFIG_DISABLE_PTHREAD
       /* Verify pthreads and condition variable timed waits */