From 7370d3171a7fb6b9496d2187489c2b3c7abd9c40 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 21 Jul 2016 14:05:44 -0600
Subject: [PATCH] Move include/nuttx/lib.h to include/nuttx/lib/lib.h

---
 drivers/dev_urandom.c            | 2 +-
 include/nuttx/{ => lib}/lib.h    | 8 ++++----
 libc/misc/lib_stream.c           | 2 +-
 libc/stdlib/lib_rand.c           | 2 +-
 libc/stdlib/lib_srand.c          | 2 +-
 sched/group/group_leave.c        | 2 +-
 sched/group/group_setupstreams.c | 2 +-
 sched/init/os_start.c            | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)
 rename include/nuttx/{ => lib}/lib.h (96%)

diff --git a/drivers/dev_urandom.c b/drivers/dev_urandom.c
index 06f4038cc7e..4923544eae2 100644
--- a/drivers/dev_urandom.c
+++ b/drivers/dev_urandom.c
@@ -50,7 +50,7 @@
 #include <poll.h>
 #include <errno.h>
 
-#include <nuttx/lib.h>
+#include <nuttx/lib/lib.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/drivers/drivers.h>
 
diff --git a/include/nuttx/lib.h b/include/nuttx/lib/lib.h
similarity index 96%
rename from include/nuttx/lib.h
rename to include/nuttx/lib/lib.h
index 24c1a8aec29..5a55af8046a 100644
--- a/include/nuttx/lib.h
+++ b/include/nuttx/lib/lib.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/lib.h
+ * include/nuttx/lib/lib.h
  * Non-standard, internal APIs available in lib/.
  *
  *   Copyright (C) 2007-2009, 2012-2014, 2016 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_LIB_H
-#define __INCLUDE_NUTTX_LIB_H
+#ifndef __INCLUDE_NUTTX_LIB_LIB_H
+#define __INCLUDE_NUTTX_LIB_LIB_H
 
 /****************************************************************************
  * Included Files
@@ -87,4 +87,4 @@ unsigned long nrand(unsigned long limit);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __INCLUDE_NUTTX_LIB_H */
+#endif /* __INCLUDE_NUTTX_LIB_LIB_H */
diff --git a/libc/misc/lib_stream.c b/libc/misc/lib_stream.c
index bcf78389b09..276d40d5e2e 100644
--- a/libc/misc/lib_stream.c
+++ b/libc/misc/lib_stream.c
@@ -46,7 +46,7 @@
 #include <nuttx/kmalloc.h>
 #include <nuttx/sched.h>
 #include <nuttx/fs/fs.h>
-#include <nuttx/lib.h>
+#include <nuttx/lib/lib.h>
 
 #include "libc.h"
 
diff --git a/libc/stdlib/lib_rand.c b/libc/stdlib/lib_rand.c
index 440372fe72e..8de8c763d04 100644
--- a/libc/stdlib/lib_rand.c
+++ b/libc/stdlib/lib_rand.c
@@ -42,7 +42,7 @@
 #include <sys/types.h>
 #include <stdlib.h>
 
-#include <nuttx/lib.h>
+#include <nuttx/lib/lib.h>
 
 /****************************************************************************
  * Public Functions
diff --git a/libc/stdlib/lib_srand.c b/libc/stdlib/lib_srand.c
index 0941fc8bd7d..a1c87f0d436 100644
--- a/libc/stdlib/lib_srand.c
+++ b/libc/stdlib/lib_srand.c
@@ -42,7 +42,7 @@
 #include <sys/types.h>
 #include <stdlib.h>
 
-#include <nuttx/lib.h>
+#include <nuttx/lib/lib.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/sched/group/group_leave.c b/sched/group/group_leave.c
index 9c5cf0f50b0..7339e61cf0e 100644
--- a/sched/group/group_leave.c
+++ b/sched/group/group_leave.c
@@ -47,7 +47,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/fs/fs.h>
 #include <nuttx/net/net.h>
-#include <nuttx/lib.h>
+#include <nuttx/lib/lib.h>
 
 #include "environ/environ.h"
 #include "signal/signal.h"
diff --git a/sched/group/group_setupstreams.c b/sched/group/group_setupstreams.c
index 02df7b7b53e..63929de8e6f 100644
--- a/sched/group/group_setupstreams.c
+++ b/sched/group/group_setupstreams.c
@@ -44,7 +44,7 @@
 
 #include <nuttx/fs/fs.h>
 #include <nuttx/net/net.h>
-#include <nuttx/lib.h>
+#include <nuttx/lib/lib.h>
 
 #include "group/group.h"
 
diff --git a/sched/init/os_start.c b/sched/init/os_start.c
index 1a65af1403c..54ef7b4a276 100644
--- a/sched/init/os_start.c
+++ b/sched/init/os_start.c
@@ -49,7 +49,7 @@
 #include  <nuttx/sched.h>
 #include  <nuttx/fs/fs.h>
 #include  <nuttx/net/net.h>
-#include  <nuttx/lib.h>
+#include  <nuttx/lib/lib.h>
 #include  <nuttx/mm/mm.h>
 #include  <nuttx/mm/shm.h>
 #include  <nuttx/kmalloc.h>