From 69dfe5aeec3d2e08baa033309ac4b84712367ac6 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Sat, 17 Jun 2017 23:18:11 +0200 Subject: Fix compilation warning on deprecated macro A warning was printed even if the deprecation didn't apply to libosmocore because it is still allowed to use it internally. This patch fixes this case while still printing a warning if external projects build using libosmocore headers. Change-Id: I32212f20756f828af1017482a71e29e4b3adbad4 --- include/osmocom/core/defs.h | 6 ++++++ include/osmocom/core/logging.h | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'include/osmocom') diff --git a/include/osmocom/core/defs.h b/include/osmocom/core/defs.h index aebe9258..51ac4e51 100644 --- a/include/osmocom/core/defs.h +++ b/include/osmocom/core/defs.h @@ -41,6 +41,12 @@ # define OSMO_DEPRECATED(text) #endif +#if BUILDING_LIBOSMOCORE +# define OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE +#else +# define OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE OSMO_DEPRECATED("For internal use inside libosmocore only.") +#endif + #undef _OSMO_HAS_ATTRIBUTE_DEPRECATED_WITH_MESSAGE #undef _OSMO_HAS_ATTRIBUTE_DEPRECATED diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 77343e96..7af0ad20 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -332,8 +332,8 @@ void log_add_target(struct log_target *target); void log_del_target(struct log_target *target); /* Generate command string for VTY use */ -const char *log_vty_command_string() OSMO_DEPRECATED("For internal use inside libosmocore only."); -const char *log_vty_command_description() OSMO_DEPRECATED("For internal use inside libosmocore only."); +const char *log_vty_command_string() OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE; +const char *log_vty_command_description() OSMO_DEPRECATED_OUTSIDE_LIBOSMOCORE; struct log_target *log_target_find(int type, const char *fname); extern struct llist_head osmo_log_target_list; -- cgit v1.2.3