diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-10-03 12:46:37 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-10-04 10:17:12 +0200 |
| commit | c250fa3797b40f70cbac1d9e417b1d3ad946ee89 (patch) | |
| tree | 2bceffbeefddda40fc6a5c0f64e9e5b9eeb4a028 /plugins/mbm | |
| parent | 8bdcdeecb68036bb6be39c5896342f1f1905b606 (diff) | |
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.
Diffstat (limited to 'plugins/mbm')
| -rw-r--r-- | plugins/mbm/mm-broadband-bearer-mbm.c | 3 | ||||
| -rw-r--r-- | plugins/mbm/mm-broadband-bearer-mbm.h | 3 | ||||
| -rw-r--r-- | plugins/mbm/mm-plugin-mbm.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/plugins/mbm/mm-broadband-bearer-mbm.c b/plugins/mbm/mm-broadband-bearer-mbm.c index 08c72846..ee9399db 100644 --- a/plugins/mbm/mm-broadband-bearer-mbm.c +++ b/plugins/mbm/mm-broadband-bearer-mbm.c @@ -32,7 +32,8 @@ #include <arpa/inet.h> #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-base-modem-at.h" #include "mm-broadband-bearer-mbm.h" diff --git a/plugins/mbm/mm-broadband-bearer-mbm.h b/plugins/mbm/mm-broadband-bearer-mbm.h index ca798008..dcbeeecf 100644 --- a/plugins/mbm/mm-broadband-bearer-mbm.h +++ b/plugins/mbm/mm-broadband-bearer-mbm.h @@ -28,7 +28,8 @@ #include <glib.h> #include <glib-object.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-broadband-bearer.h" #include "mm-broadband-modem-mbm.h" diff --git a/plugins/mbm/mm-plugin-mbm.c b/plugins/mbm/mm-plugin-mbm.c index 09ba5ccd..d776265f 100644 --- a/plugins/mbm/mm-plugin-mbm.c +++ b/plugins/mbm/mm-plugin-mbm.c @@ -20,7 +20,8 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-log.h" #include "mm-plugin-mbm.h" |