From 0388bb9e38ffc38237c9bf08bafda3be0e4de717 Mon Sep 17 00:00:00 2001 From: Olaf Bergmann Date: Mon, 7 Jan 2019 00:51:10 +0100 Subject: [PATCH] Renamed debug.[hc] to coap_debug.[hc] Prefixing the file name with "coap_" helps avoiding a name clash when libcoap is included as package in RIOT [1]. [1] https://github.com/RIOT-OS/RIOT --- Makefile.am | 4 ++-- include/coap2/coap.h.in | 2 +- include/coap2/{debug.h => coap_debug.h} | 2 +- src/async.c | 2 +- src/block.c | 2 +- src/{debug.c => coap_debug.c} | 2 +- src/coap_gnutls.c | 2 +- src/coap_io.c | 2 +- src/coap_openssl.c | 2 +- src/coap_session.c | 2 +- src/coap_tinydtls.c | 2 +- src/mem.c | 2 +- src/net.c | 2 +- src/option.c | 2 +- src/pdu.c | 2 +- src/resource.c | 2 +- src/str.c | 2 +- src/uri.c | 2 +- win32/libcoap.vcxproj | 6 +++--- win32/libcoap.vcxproj.filters | 6 +++--- 20 files changed, 25 insertions(+), 25 deletions(-) rename include/coap2/{debug.h => coap_debug.h} (99%) rename src/{debug.c => coap_debug.c} (99%) diff --git a/Makefile.am b/Makefile.am index 5b4d2fb1..165e5bdc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -77,7 +77,7 @@ libcoap_@LIBCOAP_NAME_SUFFIX@_la_SOURCES = \ src/coap_session.c \ src/coap_time.c \ src/coap_tinydtls.c \ - src/debug.c \ + src/coap_debug.c \ src/encode.c \ src/mem.c \ src/net.c \ @@ -111,7 +111,7 @@ libcoap_include_HEADERS = \ $(top_srcdir)/include/coap$(LIBCOAP_API_VERSION)/coap_io.h \ $(top_srcdir)/include/coap$(LIBCOAP_API_VERSION)/coap_session.h \ $(top_srcdir)/include/coap$(LIBCOAP_API_VERSION)/coap_time.h \ - $(top_srcdir)/include/coap$(LIBCOAP_API_VERSION)/debug.h \ + $(top_srcdir)/include/coap$(LIBCOAP_API_VERSION)/coap_debug.h \ $(top_srcdir)/include/coap$(LIBCOAP_API_VERSION)/encode.h \ $(top_srcdir)/include/coap$(LIBCOAP_API_VERSION)/libcoap.h \ $(top_srcdir)/include/coap$(LIBCOAP_API_VERSION)/mem.h \ diff --git a/include/coap2/coap.h.in b/include/coap2/coap.h.in index f6d27706..21f465cd 100644 --- a/include/coap2/coap.h.in +++ b/include/coap2/coap.h.in @@ -40,7 +40,7 @@ extern "C" { #include "coap_event.h" #include "coap_io.h" #include "coap_time.h" -#include "debug.h" +#include "coap_debug.h" #include "encode.h" #include "mem.h" #include "net.h" diff --git a/include/coap2/debug.h b/include/coap2/coap_debug.h similarity index 99% rename from include/coap2/debug.h rename to include/coap2/coap_debug.h index e57865b5..699f3b5a 100644 --- a/include/coap2/debug.h +++ b/include/coap2/coap_debug.h @@ -1,5 +1,5 @@ /* - * debug.h -- debug utilities + * coap_debug.h -- debug utilities * * Copyright (C) 2010-2011,2014 Olaf Bergmann * diff --git a/src/async.c b/src/async.c index 25a1c8e7..d787990a 100644 --- a/src/async.c +++ b/src/async.c @@ -16,7 +16,7 @@ #include "coap_config.h" #include "coap.h" #include "async.h" -#include "debug.h" +#include "coap_debug.h" #include "mem.h" #include "utlist.h" diff --git a/src/block.c b/src/block.c index b2621a1d..df3aea5b 100644 --- a/src/block.c +++ b/src/block.c @@ -13,7 +13,7 @@ #endif #include "libcoap.h" -#include "debug.h" +#include "coap_debug.h" #include "block.h" #include "resource.h" #include "coap_hashkey.h" diff --git a/src/debug.c b/src/coap_debug.c similarity index 99% rename from src/debug.c rename to src/coap_debug.c index 635666df..2c6fbee8 100644 --- a/src/debug.c +++ b/src/coap_debug.c @@ -34,7 +34,7 @@ #include "libcoap.h" #include "block.h" -#include "debug.h" +#include "coap_debug.h" #include "encode.h" #include "net.h" diff --git a/src/coap_gnutls.c b/src/coap_gnutls.c index 8f940910..df722ca0 100644 --- a/src/coap_gnutls.c +++ b/src/coap_gnutls.c @@ -27,7 +27,7 @@ #include "net.h" #include "mem.h" -#include "debug.h" +#include "coap_debug.h" #include "prng.h" #include #include diff --git a/src/coap_io.c b/src/coap_io.c index 37ecbf0a..fb6f58b6 100644 --- a/src/coap_io.c +++ b/src/coap_io.c @@ -46,7 +46,7 @@ #endif #include "libcoap.h" -#include "debug.h" +#include "coap_debug.h" #include "mem.h" #include "net.h" #include "coap_io.h" diff --git a/src/coap_openssl.c b/src/coap_openssl.c index 0547a233..9f621556 100644 --- a/src/coap_openssl.c +++ b/src/coap_openssl.c @@ -42,7 +42,7 @@ */ #include "net.h" #include "mem.h" -#include "debug.h" +#include "coap_debug.h" #include "prng.h" #include #include diff --git a/src/coap_session.c b/src/coap_session.c index aeee47ac..cb59715b 100644 --- a/src/coap_session.c +++ b/src/coap_session.c @@ -14,7 +14,7 @@ #include "coap_io.h" #include "coap_session.h" #include "net.h" -#include "debug.h" +#include "coap_debug.h" #include "mem.h" #include "resource.h" #include "utlist.h" diff --git a/src/coap_tinydtls.c b/src/coap_tinydtls.c index c3e5c239..e28c053d 100644 --- a/src/coap_tinydtls.c +++ b/src/coap_tinydtls.c @@ -13,7 +13,7 @@ #include "net.h" #include "address.h" -#include "debug.h" +#include "coap_debug.h" #include "mem.h" /* We want TinyDTLS versions of these, not libcoap versions */ diff --git a/src/mem.c b/src/mem.c index 5e71ca33..a181cba4 100644 --- a/src/mem.c +++ b/src/mem.c @@ -10,7 +10,7 @@ #include "coap_config.h" #include "libcoap.h" #include "mem.h" -#include "debug.h" +#include "coap_debug.h" #ifdef HAVE_ASSERT_H #include diff --git a/src/net.c b/src/net.c index 2d84a8b7..6559a5bd 100644 --- a/src/net.c +++ b/src/net.c @@ -43,7 +43,7 @@ #include "libcoap.h" #include "utlist.h" -#include "debug.h" +#include "coap_debug.h" #include "mem.h" #include "str.h" #include "async.h" diff --git a/src/option.c b/src/option.c index bb654e21..2686e605 100644 --- a/src/option.c +++ b/src/option.c @@ -20,7 +20,7 @@ #include "libcoap.h" #include "option.h" #include "encode.h" /* for coap_fls() */ -#include "debug.h" +#include "coap_debug.h" #include "mem.h" #include "utlist.h" diff --git a/src/pdu.c b/src/pdu.c index f7900cd8..bc57ffe1 100644 --- a/src/pdu.c +++ b/src/pdu.c @@ -27,7 +27,7 @@ #endif #include "libcoap.h" -#include "debug.h" +#include "coap_debug.h" #include "pdu.h" #include "option.h" #include "encode.h" diff --git a/src/resource.c b/src/resource.c index 634f4e6a..1d8c6a2e 100644 --- a/src/resource.c +++ b/src/resource.c @@ -9,7 +9,7 @@ #include #include "coap_config.h" #include "coap.h" -#include "debug.h" +#include "coap_debug.h" #include "mem.h" #include "net.h" #include "resource.h" diff --git a/src/str.c b/src/str.c index 60ead806..4a2ef2b3 100644 --- a/src/str.c +++ b/src/str.c @@ -11,7 +11,7 @@ #include #include "libcoap.h" -#include "debug.h" +#include "coap_debug.h" #include "mem.h" #include "str.h" diff --git a/src/uri.c b/src/uri.c index c5774a65..58934b6e 100644 --- a/src/uri.c +++ b/src/uri.c @@ -22,7 +22,7 @@ #include "libcoap.h" #include "mem.h" -#include "debug.h" +#include "coap_debug.h" #include "pdu.h" #include "option.h" #include "uri.h" diff --git a/win32/libcoap.vcxproj b/win32/libcoap.vcxproj index 7ab1ed7d..d1bd6d45 100644 --- a/win32/libcoap.vcxproj +++ b/win32/libcoap.vcxproj @@ -46,7 +46,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -560,4 +560,4 @@ copy /Y ..\include\coap2\coap.h.windows ..\include\coap2\coap.h - \ No newline at end of file + diff --git a/win32/libcoap.vcxproj.filters b/win32/libcoap.vcxproj.filters index 40224159..a76bf054 100644 --- a/win32/libcoap.vcxproj.filters +++ b/win32/libcoap.vcxproj.filters @@ -30,7 +30,7 @@ Source Files - + Source Files @@ -113,7 +113,7 @@ Header Files - + Header Files @@ -159,4 +159,4 @@ - \ No newline at end of file +