cec: fix win32 compilation (new parameter)

diff --git a/include/cectypes.h b/include/cectypes.h
index 1c52cb79b6ac2d50b47396be769a2b59945cd5ad..ce09d8383e37f7a82e0dadb632a904fa810101e8 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -38,15 +38,14 @@
 #include <string.h>
 
 #if defined(_WIN32) || defined(_WIN64)
-#define CDECL    __cdecl
+#define CEC_CDECL    __cdecl
 #else
-#define CDECL
+#define CEC_CDECL
 #endif
 
 #if !defined(DECLSPEC)
 #if defined(_WIN32) || defined(_WIN64)
 #include <windows.h>
-#define CDECL    __cdecl
 #if defined DLL_EXPORT
 #define DECLSPEC __declspec(dllexport)
 #else
@@ -874,9 +873,9 @@ typedef struct cec_logical_addresses
 } cec_logical_addresses;
 
 
-typedef int (CDECL* CBCecLogMessageType)(void *param, const CEC::cec_log_message &);
-typedef int (CDECL* CBCecKeyPressType)(void *param, const cec_keypress &key);
-typedef int (CDECL* CBCecCommandType)(void *param, 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
 {

diff --git a/src/LibCecSharp/LibCecSharp.cpp b/src/LibCecSharp/LibCecSharp.cpp
index 58e244613491081af68a8cb54f6fad33bd6b527c..3aa1253512034786373e2ad432bfeff429ae623a 100644 (file)
--- a/src/LibCecSharp/LibCecSharp.cpp
+++ b/src/LibCecSharp/LibCecSharp.cpp
@@ -525,21 +525,21 @@ static KEYCB         g_keyCB;
 static COMMANDCB     g_commandCB;
 static ICECCallbacks g_cecCallbacks;
 
-int CecLogMessageCB(const cec_log_message &message)
+int CecLogMessageCB(void *cbParam, const cec_log_message &message)
 {
   if (g_logCB)
     return g_logCB(message);
   return 0;
 }
 
-int CecKeyPressCB(const cec_keypress &key)
+int CecKeyPressCB(void *cbParam, const cec_keypress &key)
 {
   if (g_keyCB)
     return g_keyCB(key);
   return 0;
 }
 
-int CecCommandCB(const cec_command &command)
+int CecCommandCB(void *cbParam, const cec_command &command)
 {
   if (g_commandCB)
     return g_commandCB(command);
@@ -641,7 +641,7 @@ public:
     {
       m_bHasCallbacks = true;
       m_callbacks = callbacks;
-      return m_libCec->EnableCallbacks(&g_cecCallbacks);
+      return m_libCec->EnableCallbacks(NULL, &g_cecCallbacks);
     }
 
     return false;