pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/30251 )
Change subject: Convert gprs_debug.cpp to C ......................................................................
Convert gprs_debug.cpp to C
Change-Id: I142b870abda36950db5ff296c7c22228b0b11f55 --- M debian/copyright M src/Makefile.am R src/gprs_debug.c M src/gprs_debug.h 4 files changed, 8 insertions(+), 8 deletions(-)
Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved
diff --git a/debian/copyright b/debian/copyright index da50658..c714f1f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -30,7 +30,7 @@ Copyright: 2013 by Katerina Barone-Adesi kat.obsc@gmail.com License: GPL-3.0+
-Files: src/gprs_debug.cpp +Files: src/gprs_debug.c src/gprs_debug.h src/pcu_main.cpp src/pcu_l1_if.h diff --git a/src/Makefile.am b/src/Makefile.am index ccc40ac..e7e94e0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -39,7 +39,7 @@ noinst_LTLIBRARIES = libgprs.la
libgprs_la_SOURCES = \ - gprs_debug.cpp \ + gprs_debug.c \ csn1.c \ csn1_dec.c \ csn1_enc.c \ diff --git a/src/gprs_debug.cpp b/src/gprs_debug.c similarity index 97% rename from src/gprs_debug.cpp rename to src/gprs_debug.c index 61c1c87..03ef083 100644 --- a/src/gprs_debug.cpp +++ b/src/gprs_debug.c @@ -1,7 +1,8 @@ -/* gprs_debug.cpp +/* gprs_debug.c * * Copyright (C) 2012 Ivan Klyuchnikov * Copyright (C) 2019 Harald Welte laforge@gnumonks.org + * Copyright (C) 2022 by sysmocom - s.f.m.c. GmbH info@sysmocom.de * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -14,10 +15,8 @@ * GNU General Public License for more details. */
-extern "C" { #include <osmocom/core/utils.h> #include <osmocom/core/logging.h> -}
#include <gprs_debug.h>
diff --git a/src/gprs_debug.h b/src/gprs_debug.h index b683a63..320c739 100644 --- a/src/gprs_debug.h +++ b/src/gprs_debug.h @@ -19,9 +19,6 @@ extern "C" { #endif #include <osmocom/core/logging.h> -#ifdef __cplusplus -}; -#endif
/* we used to have DBSSGP definded in each application, and applications telling * libosmogb which sub-system to use. That creates problems and has been deprecated */ @@ -48,3 +45,7 @@ };
extern const struct log_info gprs_log_info; + +#ifdef __cplusplus +}; +#endif
-
pespin