Make cectypes.h compile under C.

[deb_libcec.git] / include / cectypes.h

diff --git a/include/cectypes.h b/include/cectypes.h
index 515c5524439904e36366970aec9458231fab400e..2f06aeb15c08375695951b8ee17e2fa04b70e19d 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -120,7 +120,7 @@ namespace CEC {
 #define CEC_MIN_LIB_VERSION          1
 #define CEC_LIB_VERSION_MAJOR        1
 #define CEC_LIB_VERSION_MAJOR_STR    "1"
-#define CEC_LIB_VERSION_MINOR        8
+#define CEC_LIB_VERSION_MINOR        9
 
 typedef enum cec_abort_reason
 {
@@ -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);
 
@@ -1194,7 +1194,8 @@ typedef enum cec_client_version
   CEC_CLIENT_VERSION_1_7_2   = 0x1702,
   CEC_CLIENT_VERSION_1_8_0   = 0x1800,
   CEC_CLIENT_VERSION_1_8_1   = 0x1801,
-  CEC_CLIENT_VERSION_1_8_2   = 0x1802
+  CEC_CLIENT_VERSION_1_8_2   = 0x1802,
+  CEC_CLIENT_VERSION_1_9_0   = 0x1900
 } cec_client_version;
 
 typedef enum cec_server_version
@@ -1213,10 +1214,11 @@ typedef enum cec_server_version
   CEC_SERVER_VERSION_1_7_2   = 0x1702,
   CEC_SERVER_VERSION_1_8_0   = 0x1800,
   CEC_SERVER_VERSION_1_8_1   = 0x1801,
-  CEC_SERVER_VERSION_1_8_2   = 0x1802
+  CEC_SERVER_VERSION_1_8_2   = 0x1802,
+  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 */
@@ -1342,7 +1344,7 @@ typedef struct libcec_configuration
     callbacks     = NULL;
   }
 #endif
-} libcec_configuration;
+};
 
 #ifdef __cplusplus
 };