From c96725e7ebf4945309830c78f4a0389e42a21566 Mon Sep 17 00:00:00 2001 From: Ben Chan Date: Tue, 27 Jun 2017 23:38:04 -0700 Subject: libqmi-glib: fix G_DEPRECATED_FOR annotations qmi-compat.h defines a few deprecated enumerators as an alias to their equivalence using macros and annotates those macros with G_DEPRECATED_FOR, which may be expanded to `__attribute__((deprecated))'. Neither gcc nor clang supports `__attribute__((deprecated))' on macros. Thus, a G_DEPRECATED_FOR annotation before a macro definition is actually associated with the next identifier found after the macro definition, which is incorrect. Alternatively, the G_DEPRECATED_FOR annotation can be used on the deprecated enumerators. But only gcc 6 or above supports enumerator attributes. To address the issue, this patch defines the deprecated enumerators as `static const int' values, which can then be annotated with G_DEPRECATED_FOR. --- src/libqmi-glib/qmi-compat.h | 87 +++++++++++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 29 deletions(-) (limited to 'src') diff --git a/src/libqmi-glib/qmi-compat.h b/src/libqmi-glib/qmi-compat.h index 8b955bf..6bf1f01 100644 --- a/src/libqmi-glib/qmi-compat.h +++ b/src/libqmi-glib/qmi-compat.h @@ -124,7 +124,8 @@ gboolean qmi_message_dms_set_service_programming_code_input_set_current ( * Deprecated: 1.14.0: Use the correct #QMI_NAS_SIM_REJECT_STATE_SIM_AVAILABLE name instead. */ G_DEPRECATED_FOR (QMI_NAS_SIM_REJECT_STATE_SIM_AVAILABLE) -#define QMI_NAS_SIM_REJECT_STATE_SIM_VAILABLE QMI_NAS_SIM_REJECT_STATE_SIM_AVAILABLE +static const int QMI_NAS_SIM_REJECT_STATE_SIM_VAILABLE = + QMI_NAS_SIM_REJECT_STATE_SIM_AVAILABLE; /** * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT: @@ -135,7 +136,8 @@ G_DEPRECATED_FOR (QMI_NAS_SIM_REJECT_STATE_SIM_AVAILABLE) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT) -#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT +static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT = + QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT; /** * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE: @@ -146,7 +148,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_VACANT) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE) -#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE +static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE = + QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE; /** * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE: @@ -157,7 +160,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_ADDRESS_TRANSLATION_FAILURE) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE) -#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE QMI_WMS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE +static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE = + QMI_WMS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE; /** * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_FAILURE: @@ -168,7 +172,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_RESOURCE_SHORTAGE) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_NETWORK_FAILURE name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_FAILURE) -#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_FAILURE QMI_WMS_CDMA_CAUSE_CODE_NETWORK_FAILURE +static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_FAILURE = + QMI_WMS_CDMA_CAUSE_CODE_NETWORK_FAILURE; /** * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID: @@ -179,7 +184,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_FAILURE) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID) -#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID QMI_WMS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID +static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID = + QMI_WMS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID; /** * QMI_WDS_CDMA_CAUSE_CODE_NETWORK_OTHER: @@ -190,7 +196,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_INVALID_TELESERVICE_ID) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_NETWORK_OTHER name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_OTHER) -#define QMI_WDS_CDMA_CAUSE_CODE_NETWORK_OTHER QMI_WMS_CDMA_CAUSE_CODE_NETWORK_OTHER +static const int QMI_WDS_CDMA_CAUSE_CODE_NETWORK_OTHER = + QMI_WMS_CDMA_CAUSE_CODE_NETWORK_OTHER; /** * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE: @@ -201,7 +208,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_NETWORK_OTHER) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE) -#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE +static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE = + QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE; /** * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_BUSY: @@ -212,7 +220,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_PAGE_RESPONSE) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_BUSY name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_BUSY) -#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_BUSY QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_BUSY +static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_BUSY = + QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_BUSY; /** * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK: @@ -223,7 +232,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_BUSY) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK) -#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK +static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK = + QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK; /** @@ -235,7 +245,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NO_ACK) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE) -#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE +static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE = + QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE; /** * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED: @@ -246,7 +257,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_RESOURCE_SHORTAGE) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED) -#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED +static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED = + QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED; /** * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE: @@ -257,7 +269,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_SMS_DELIVERY_POSTPONED) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE) -#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE +static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE = + QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE; /** * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS: @@ -268,7 +281,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OUT_OF_SERVICE) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS) -#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS +static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS = + QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS; /** * QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OTHER: @@ -279,7 +293,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_NOT_AT_ADDRESS) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OTHER name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OTHER) -#define QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OTHER QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OTHER +static const int QMI_WDS_CDMA_CAUSE_CODE_DESTINATION_OTHER = + QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OTHER; /** * QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE: @@ -290,7 +305,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_DESTINATION_OTHER) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE) -#define QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE +static const int QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE = + QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE; /** * QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY: @@ -301,7 +317,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_RESOURCE_SHORTAGE) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY) -#define QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY +static const int QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY = + QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY; /** * QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER: @@ -312,7 +329,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_INCOMPATIBILITY) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER) -#define QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER +static const int QMI_WDS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER = + QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER; /** * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_ENCODING: @@ -323,7 +341,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_RADIO_INTERFACE_OTHER) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_ENCODING name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_ENCODING) -#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_ENCODING QMI_WMS_CDMA_CAUSE_CODE_GENERAL_ENCODING +static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_ENCODING = + QMI_WMS_CDMA_CAUSE_CODE_GENERAL_ENCODING; /** * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED: @@ -334,7 +353,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_ENCODING) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED) -#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED +static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED = + QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED; /** * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED: @@ -345,7 +365,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_ORIGIN_DENIED) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED) -#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED +static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED = + QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED; /** * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED: @@ -356,7 +377,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_DESTINATION_DENIED) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED) -#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED +static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED = + QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPPORTED; /** * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED: @@ -367,7 +389,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SUPPLEMENTARY_SERVICE_NOT_SUPP * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_SMS_NOT_SUPPORTED) -#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED +static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED = + QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_NOT_SUPPORTED; /** * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER: @@ -378,7 +401,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_SMS_SMS_NOT_SUPPORTED) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER) -#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER +static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER = + QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER; /** * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER: @@ -389,7 +413,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_EXPECTED_PARAMETER) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER) -#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER +static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER = + QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER; /** * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE: @@ -400,7 +425,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_MISSING_MANDATORY_PARAMETER) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE) -#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE +static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE = + QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE; /** * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE: @@ -411,7 +437,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNRECOGNIZED_PARAMETER_VALUE) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE) -#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE +static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE = + QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE; /** * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR: @@ -422,7 +449,8 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_UNEXPECTED_PARAMETER_VALUE) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR) -#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR QMI_WMS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR +static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR = + QMI_WMS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR; /** * QMI_WDS_CDMA_CAUSE_CODE_GENERAL_OTHER: @@ -433,6 +461,7 @@ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_USER_DATA_SIZE_ERROR) * Deprecated: 1.18.0: Use the correct #QMI_WMS_CDMA_CAUSE_CODE_GENERAL_OTHER name instead. */ G_DEPRECATED_FOR (QMI_WMS_CDMA_CAUSE_CODE_GENERAL_OTHER) -#define QMI_WDS_CDMA_CAUSE_CODE_GENERAL_OTHER QMI_WMS_CDMA_CAUSE_CODE_GENERAL_OTHER +static const int QMI_WDS_CDMA_CAUSE_CODE_GENERAL_OTHER = + QMI_WMS_CDMA_CAUSE_CODE_GENERAL_OTHER; #endif /* _LIBQMI_GLIB_QMI_COMPAT_H_ */ -- cgit v1.1