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 /src/mm-iface-modem-simple.c | |
| 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 'src/mm-iface-modem-simple.c')
| -rw-r--r-- | src/mm-iface-modem-simple.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mm-iface-modem-simple.c b/src/mm-iface-modem-simple.c index cfec2805..952a3c03 100644 --- a/src/mm-iface-modem-simple.c +++ b/src/mm-iface-modem-simple.c @@ -16,7 +16,8 @@ */ #include <ModemManager.h> -#include <libmm-common.h> +#define _LIBMM_INSIDE_MM +#include <libmm-glib.h> #include "mm-bearer-list.h" #include "mm-sim.h" |