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/wavecom | |
| 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/wavecom')
| -rw-r--r-- | plugins/wavecom/mm-broadband-modem-wavecom.c | 3 | ||||
| -rw-r--r-- | plugins/wavecom/mm-plugin-wavecom.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/plugins/wavecom/mm-broadband-modem-wavecom.c b/plugins/wavecom/mm-broadband-modem-wavecom.c index ca9f29ca..e6afb730 100644 --- a/plugins/wavecom/mm-broadband-modem-wavecom.c +++ b/plugins/wavecom/mm-broadband-modem-wavecom.c @@ -23,7 +23,8 @@ #include <unistd.h> #include <ctype.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "ModemManager.h" #include "mm-log.h" diff --git a/plugins/wavecom/mm-plugin-wavecom.c b/plugins/wavecom/mm-plugin-wavecom.c index 82eec9bc..80b6ed71 100644 --- a/plugins/wavecom/mm-plugin-wavecom.c +++ b/plugins/wavecom/mm-plugin-wavecom.c @@ -25,7 +25,8 @@ #include <string.h> #include <gmodule.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-plugin-wavecom.h" #include "mm-broadband-modem-wavecom.h" |