From 834193484439acd6056a891e9b2df5992a370088 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@gnumonks.org>
Date: Tue, 22 Mar 2011 16:36:13 +0100
Subject: include: reorganize headers file to include/osmocom/[gsm|core]

This patch moves all GSM-specific definitions to include/osmocom/gsm.
Moreover, the headers in include/osmocore/ have been moved to
include/osmocom/core.

This has been proposed by Harald Welte and Sylvain Munaunt.

Tested with `make distcheck'.

Signed-off-by: Pablo Neira Ayuso <pablo@gnumonks.org>
---
 src/vty/buffer.c           | 2 +-
 src/vty/command.c          | 2 +-
 src/vty/logging_vty.c      | 6 +++---
 src/vty/telnet_interface.c | 6 +++---
 src/vty/utils.c            | 8 ++++----
 src/vty/vector.c           | 2 +-
 src/vty/vty.c              | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/vty')

diff --git a/src/vty/buffer.c b/src/vty/buffer.c
index a5655b93..e385f9fd 100644
--- a/src/vty/buffer.c
+++ b/src/vty/buffer.c
@@ -28,7 +28,7 @@
 #include <stddef.h>
 #include <sys/uio.h>
 
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 #include <osmocom/vty/buffer.h>
 #include <osmocom/vty/vty.h>
 
diff --git a/src/vty/command.c b/src/vty/command.c
index 0f65224f..5dc1dd45 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -38,7 +38,7 @@ Boston, MA 02111-1307, USA.  */
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/command.h>
 
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 
 #define CONFIGFILE_MASK 022
 
diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c
index 1b356c9f..4cab22a3 100644
--- a/src/vty/logging_vty.c
+++ b/src/vty/logging_vty.c
@@ -24,9 +24,9 @@
 
 #include "../../config.h"
 
-#include <osmocore/talloc.h>
-#include <osmocore/logging.h>
-#include <osmocore/utils.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/utils.h>
 
 //#include <openbsc/vty.h>
 
diff --git a/src/vty/telnet_interface.c b/src/vty/telnet_interface.c
index 098fa2e6..0d45d614 100644
--- a/src/vty/telnet_interface.c
+++ b/src/vty/telnet_interface.c
@@ -25,9 +25,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <osmocore/msgb.h>
-#include <osmocore/talloc.h>
-#include <osmocore/logging.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/logging.h>
 
 #include <osmocom/vty/telnet_interface.h>
 #include <osmocom/vty/buffer.h>
diff --git a/src/vty/utils.c b/src/vty/utils.c
index e163526e..7797e62d 100644
--- a/src/vty/utils.c
+++ b/src/vty/utils.c
@@ -23,10 +23,10 @@
 #include <stdint.h>
 #include <inttypes.h>
 
-#include <osmocore/linuxlist.h>
-#include <osmocore/talloc.h>
-#include <osmocore/timer.h>
-#include <osmocore/rate_ctr.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/timer.h>
+#include <osmocom/core/rate_ctr.h>
 
 #include <osmocom/vty/vty.h>
 
diff --git a/src/vty/vector.c b/src/vty/vector.c
index 0343163f..4012f24b 100644
--- a/src/vty/vector.c
+++ b/src/vty/vector.c
@@ -24,7 +24,7 @@
 
 #include <osmocom/vty/vector.h>
 #include <osmocom/vty/vty.h>
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 #include <memory.h>
 
 void *tall_vty_vec_ctx;
diff --git a/src/vty/vty.c b/src/vty/vty.c
index c1a9b3af..a1f0304b 100644
--- a/src/vty/vty.c
+++ b/src/vty/vty.c
@@ -16,7 +16,7 @@
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/command.h>
 #include <osmocom/vty/buffer.h>
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
 
 #define SYSCONFDIR "/usr/local/etc"
 
-- 
cgit v1.2.3