From c250fa3797b40f70cbac1d9e417b1d3ad946ee89 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 3 Oct 2012 12:46:37 +0200 Subject: libmm-glib: remove the `libmm-common.h' header Both the ModemManager daemon and the mmcli will now include `libmm-glib.h' only. We also handle two new special `_LIBMM_INSIDE_MM' and `LIBMM_INSIDE_MMCLI' symbols, which if included before the `libmm-glib.h' library allow us to: * Don't include the libmm-glib high level API in the ModemManager daemon, as the object names would clash with those in the core. * Define some of the methods of helper objects to be included only if compiling ModemManager daemon or the mmcli. --- plugins/generic/mm-plugin-generic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins/generic/mm-plugin-generic.c') diff --git a/plugins/generic/mm-plugin-generic.c b/plugins/generic/mm-plugin-generic.c index 6721fe04..1a48f033 100644 --- a/plugins/generic/mm-plugin-generic.c +++ b/plugins/generic/mm-plugin-generic.c @@ -25,7 +25,8 @@ #include -#include +#define _LIBMM_INSIDE_MM +#include #include "mm-plugin-generic.h" #include "mm-broadband-modem.h" -- cgit v1.2.3-70-g09d2