From 892e621fec571c7cba3573caa0d328ed1b25d8ee Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Tue, 19 Jul 2011 14:31:44 +0200 Subject: make sure we don't have namespace clashes between libraries and apps * All loging prefixes in libraries should be DL like DLINP * All signals / subsystems should be called S_L_* SS_L_* * All command nodes should be called L_*_NODE This makes sure existinc code still compiles as expected --- include/osmocom/core/logging.h | 12 ++++++------ include/osmocom/core/signal.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'include/osmocom/core') diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 04692d39..20c1254a 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -39,12 +39,12 @@ void logp(int subsys, char *file, int line, int cont, const char *format, ...) _ /* logging levels defined by the library itself */ #define DLGLOBAL -1 #define DLLAPDM -2 -#define DINP -3 -#define DMUX -4 -#define DMI -5 -#define DMIB -6 -#define DRSL -7 -#define DNM -8 +#define DLINP -3 +#define DLMUX -4 +#define DLMI -5 +#define DLMIB -6 +#define DLRSL -7 +#define DLNM -8 #define OSMO_NUM_DLIB 9 struct log_category { diff --git a/include/osmocom/core/signal.h b/include/osmocom/core/signal.h index 7c32c778..2442e510 100644 --- a/include/osmocom/core/signal.h +++ b/include/osmocom/core/signal.h @@ -11,8 +11,8 @@ /* signal subsystems. */ enum { - SS_GLOBAL = OSMO_SIGNAL_SS_RESERVED, - SS_INPUT, + SS_L_GLOBAL = OSMO_SIGNAL_SS_RESERVED, + SS_L_INPUT, }; /* application-defined signal types. */ @@ -21,7 +21,7 @@ enum { /* signal types. */ enum { - S_GLOBAL_SHUTDOWN = OSMO_SIGNAL_T_RESERVED, + S_L_GLOBAL_SHUTDOWN = OSMO_SIGNAL_T_RESERVED, }; typedef int osmo_signal_cbfn(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data); -- cgit v1.2.3