diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2017-02-23 10:42:55 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2017-02-23 10:42:55 +0100 |
| commit | fd9eb6e8800cfc6929201c4a8d666ce431b0195c (patch) | |
| tree | d2dcb297e13bd890ec64821fc5dc4781259d351d /src | |
| parent | d30d2430f17162383a69503ea0e71ab56a81dbd0 (diff) | |
| download | external_libqmi-fd9eb6e8800cfc6929201c4a8d666ce431b0195c.zip external_libqmi-fd9eb6e8800cfc6929201c4a8d666ce431b0195c.tar.gz external_libqmi-fd9eb6e8800cfc6929201c4a8d666ce431b0195c.tar.bz2 | |
build: mm-runtime-check is an optional feature not an optional package
Diffstat (limited to 'src')
| -rw-r--r-- | src/qmi-firmware-update/qfu-main.c | 6 | ||||
| -rw-r--r-- | src/qmi-firmware-update/qfu-utils.c | 2 | ||||
| -rw-r--r-- | src/qmi-firmware-update/qfu-utils.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/qmi-firmware-update/qfu-main.c b/src/qmi-firmware-update/qfu-main.c index 2ecdca6..07efb63 100644 --- a/src/qmi-firmware-update/qfu-main.c +++ b/src/qmi-firmware-update/qfu-main.c @@ -51,7 +51,7 @@ static guint16 pid; static gchar *cdc_wdm_str; static gchar *tty_str; -#if defined WITH_MM_RUNTIME_CHECK +#if defined MM_RUNTIME_CHECK_ENABLED static gboolean ignore_mm_runtime_check_flag; #endif @@ -292,7 +292,7 @@ static GOptionEntry context_main_entries[] = { "Open a cdc-wdm device in either QMI or MBIM mode (default)", NULL }, -#if defined WITH_MM_RUNTIME_CHECK +#if defined MM_RUNTIME_CHECK_ENABLED { "ignore-mm-runtime-check", 0, 0, G_OPTION_ARG_NONE, &ignore_mm_runtime_check_flag, "Ignore ModemManager runtime check", NULL @@ -651,7 +651,7 @@ int main (int argc, char **argv) goto out; } -#if defined WITH_MM_RUNTIME_CHECK +#if defined MM_RUNTIME_CHECK_ENABLED /* For all those actions that require a device, we will be doing MM runtime checks */ if (!ignore_mm_runtime_check_flag) { gboolean mm_running; diff --git a/src/qmi-firmware-update/qfu-utils.c b/src/qmi-firmware-update/qfu-utils.c index 9109987..035e78f 100644 --- a/src/qmi-firmware-update/qfu-utils.c +++ b/src/qmi-firmware-update/qfu-utils.c @@ -717,7 +717,7 @@ qfu_utils_power_cycle (QmiClientDms *qmi_client, /******************************************************************************/ -#if defined WITH_MM_RUNTIME_CHECK +#if defined MM_RUNTIME_CHECK_ENABLED gboolean qfu_utils_modemmanager_running (gboolean *mm_running, diff --git a/src/qmi-firmware-update/qfu-utils.h b/src/qmi-firmware-update/qfu-utils.h index 3444db1..aaafa51 100644 --- a/src/qmi-firmware-update/qfu-utils.h +++ b/src/qmi-firmware-update/qfu-utils.h @@ -72,7 +72,7 @@ gboolean qfu_utils_power_cycle_finish (QmiClientDms *qmi_client, GAsyncResult *res, GError **error); -#if defined WITH_MM_RUNTIME_CHECK +#if defined MM_RUNTIME_CHECK_ENABLED gboolean qfu_utils_modemmanager_running (gboolean *mm_running, GError **error); |