[MERGED] libosmocore[master]: logging.h: fix backwards compat broken by recent commit

Harald Welte gerrit-no-reply at lists.osmocom.org
Thu Feb 23 17:29:55 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: logging.h: fix backwards compat broken by recent commit
......................................................................


logging.h: fix backwards compat broken by recent commit

Commit 812ba6dc63a75c39678dd3fe652768e76bf63183
"logging: centrally define ctx and filter indexes"
Removed definitions, which causes older e.g. openbsc and osmo-pcu code trees to
fail to build against a newer libosmocore. Re-introduce the legacy definitions
to redirect to the new ones and re-establish backwards compatibility.

The GPRS_* constants used to be defined in gprs_msgb.h, but since that header
also includes logging.h, rather place the legacy shims in logging.h next to the
other ones.

Change-Id: I455bb1bb474d758af0fd5b6397f7e57260ad739d
---
M include/osmocom/core/logging.h
1 file changed, 7 insertions(+), 0 deletions(-)

Approvals:
  Max: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h
index b3685b8..7c8a7ef 100644
--- a/include/osmocom/core/logging.h
+++ b/include/osmocom/core/logging.h
@@ -141,6 +141,13 @@
 	_LOGGING_FILTER_COUNT
 };
 
+/*! \brief Compatibility with older libosmocore versions */
+#define LOG_FILTER_ALL (1<<LOGGING_FILTER_ALL)
+/*! \brief Compatibility with older libosmocore versions */
+#define GPRS_CTX_NSVC LOGGING_CTX_GB_NSVC
+/*! \brief Compatibility with older libosmocore versions */
+#define GPRS_CTX_BVC LOGGING_CTX_GB_BVC
+
 struct log_target;
 
 /*! \brief Log filter function */

-- 
To view, visit https://gerrit.osmocom.org/1876
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I455bb1bb474d758af0fd5b6397f7e57260ad739d
Gerrit-PatchSet: 1
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>


More information about the gerrit-log mailing list