From 342c3f2ed313b78cc29b70c1d7b577cea3b77de0 Mon Sep 17 00:00:00 2001
From: Ken Bannister <kb2ma@runbox.com>
Date: Sun, 15 Jan 2017 06:18:04 -0500
Subject: [PATCH] gcoap: Remove coap.h include file, which is no longer used.
Also change references in dependencies to the net/gcoap.h include.
---
examples/gcoap/gcoap_cli.c | 2 +-
examples/gcoap/main.c | 2 +-
sys/auto_init/auto_init.c | 2 +-
sys/include/net/gnrc/coap.h | 23 -----------------------
tests/unittests/tests-gcoap/tests-gcoap.c | 2 +-
5 files changed, 4 insertions(+), 27 deletions(-)
delete mode 100644 sys/include/net/gnrc/coap.h
diff --git a/examples/gcoap/gcoap_cli.c b/examples/gcoap/gcoap_cli.c
index 69e774de71..4e03f280e3 100644
--- a/examples/gcoap/gcoap_cli.c
+++ b/examples/gcoap/gcoap_cli.c
@@ -22,7 +22,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "net/gnrc/coap.h"
+#include "net/gcoap.h"
#include "od.h"
#include "fmt.h"
diff --git a/examples/gcoap/main.c b/examples/gcoap/main.c
index 845d800a5a..3757922d0e 100644
--- a/examples/gcoap/main.c
+++ b/examples/gcoap/main.c
@@ -21,7 +21,7 @@
#include <stdio.h>
#include "msg.h"
-#include "net/gnrc/coap.h"
+#include "net/gcoap.h"
#include "kernel_types.h"
#include "shell.h"
diff --git a/sys/auto_init/auto_init.c b/sys/auto_init/auto_init.c
index 5af0e8f005..2a55037535 100644
--- a/sys/auto_init/auto_init.c
+++ b/sys/auto_init/auto_init.c
@@ -89,7 +89,7 @@
#endif
#ifdef MODULE_GCOAP
-#include "net/gnrc/coap.h"
+#include "net/gcoap.h"
#endif
#define ENABLE_DEBUG (0)
diff --git a/sys/include/net/gnrc/coap.h b/sys/include/net/gnrc/coap.h
deleted file mode 100644
index 33022a131f..0000000000
--- a/sys/include/net/gnrc/coap.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2015-2016 Ken Bannister. All rights reserved.
- *
- * This file is subject to the terms and conditions of the GNU Lesser
- * General Public License v2.1. See the file LICENSE in the top level
- * directory for more details.
- */
-
-/**
- * @ingroup net_gcoap
- * @brief Adapter for migration of GNRC-based gcoap to sock-based gcoap
- * @deprecated Use net/gcoap.h instead.
- *
- * @{
- *
- * @file
- *
- * @author Ken Bannister <kb2ma@runbox.com>
- */
-
-#include "net/gcoap.h"
-
-/** @} */
diff --git a/tests/unittests/tests-gcoap/tests-gcoap.c b/tests/unittests/tests-gcoap/tests-gcoap.c
index c46a368d13..b58d4cb8f1 100644
--- a/tests/unittests/tests-gcoap/tests-gcoap.c
+++ b/tests/unittests/tests-gcoap/tests-gcoap.c
@@ -17,7 +17,7 @@
#include "embUnit.h"
-#include "net/gnrc/coap.h"
+#include "net/gcoap.h"
#include "unittests-constants.h"
#include "tests-gcoap.h"
--
GitLab