From b20860402ff0b01b741aeafe106b4451345d6609 Mon Sep 17 00:00:00 2001 From: Daniel Kennett Date: Fri, 17 Aug 2012 18:43:08 +0200 Subject: [PATCH] Make cectypes.h compile under C. --- include/cectypes.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/include/cectypes.h b/include/cectypes.h index 291190c..2f06aeb 100644 --- a/include/cectypes.h +++ b/include/cectypes.h @@ -1088,19 +1088,19 @@ typedef enum libcec_parameter_type CEC_PARAMETER_TYPE_UNKOWN } libcec_parameter_type; -struct libcec_parameter +typedef struct libcec_parameter { libcec_parameter_type paramType; /**< the type of this parameter */ void* paramData; /**< the value of this parameter */ -}; +} libcec_parameter; -struct libcec_configuration; +typedef struct libcec_configuration libcec_configuration; -typedef int (CEC_CDECL* CBCecLogMessageType)(void *param, const cec_log_message &); -typedef int (CEC_CDECL* CBCecKeyPressType)(void *param, const cec_keypress &); -typedef int (CEC_CDECL* CBCecCommandType)(void *param, const cec_command &); -typedef int (CEC_CDECL* CBCecConfigurationChangedType)(void *param, const libcec_configuration &); -typedef int (CEC_CDECL* CBCecAlertType)(void *param, const libcec_alert, const libcec_parameter &); +typedef int (CEC_CDECL* CBCecLogMessageType)(void *param, const cec_log_message); +typedef int (CEC_CDECL* CBCecKeyPressType)(void *param, const cec_keypress); +typedef int (CEC_CDECL* CBCecCommandType)(void *param, const cec_command); +typedef int (CEC_CDECL* CBCecConfigurationChangedType)(void *param, const libcec_configuration); +typedef int (CEC_CDECL* CBCecAlertType)(void *param, const libcec_alert, const libcec_parameter); typedef int (CEC_CDECL* CBCecMenuStateChangedType)(void *param, const cec_menu_state); typedef void (CEC_CDECL* CBCecSourceActivatedType)(void *param, const cec_logical_address, const uint8_t); @@ -1218,7 +1218,7 @@ typedef enum cec_server_version CEC_SERVER_VERSION_1_9_0 = 0x1900 } cec_server_version; -typedef struct libcec_configuration +struct libcec_configuration { uint32_t clientVersion; /*!< the version of the client that is connecting */ char strDeviceName[13]; /*!< how to name the device on the CEC bus */ @@ -1344,7 +1344,7 @@ typedef struct libcec_configuration callbacks = NULL; } #endif -} libcec_configuration; +}; #ifdef __cplusplus }; -- 2.34.1