X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=include%2Fcectypes.h;h=ba21200fece893f93d0c13cde4be1f56d6ca5828;hb=1fe867c5130bfa2aa5b25425e288350f5e1ca4fd;hp=b8ae24dda13e70102fe705b9534d7603a72af50c;hpb=c3039d2e99a31c129c982d271f25c9c56e353643;p=deb_libcec.git diff --git a/include/cectypes.h b/include/cectypes.h index b8ae24d..ba21200 100644 --- a/include/cectypes.h +++ b/include/cectypes.h @@ -37,6 +37,12 @@ #include #include +#if defined(_WIN32) || defined(_WIN64) +#define CEC_CDECL __cdecl +#else +#define CEC_CDECL +#endif + #if !defined(DECLSPEC) #if defined(_WIN32) || defined(_WIN64) #include @@ -72,7 +78,7 @@ namespace CEC { #define CEC_MIN_LIB_VERSION 1 #define CEC_LIB_VERSION_MAJOR 1 -#define CEC_LIB_VERSION_MINOR 3 +#define CEC_LIB_VERSION_MINOR 4 typedef enum cec_abort_reason { @@ -866,9 +872,10 @@ typedef struct cec_logical_addresses #endif } cec_logical_addresses; -typedef int (__cdecl *CBCecLogMessageType)(const CEC::cec_log_message &); -typedef int (__cdecl* CBCecKeyPressType)(const cec_keypress &key); -typedef int (__cdecl* CBCecCommandType)(const cec_command &command); + +typedef int (CEC_CDECL* CBCecLogMessageType)(void *param, const CEC::cec_log_message &); +typedef int (CEC_CDECL* CBCecKeyPressType)(void *param, const cec_keypress &key); +typedef int (CEC_CDECL* CBCecCommandType)(void *param, const cec_command &command); typedef struct ICECCallbacks {