repositories
/
deb_libcec.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dd4ace4
)
cec: fix linux compilation
author
Lars Op den Kamp
<lars@opdenkamp.eu>
Thu, 12 Jan 2012 17:21:10 +0000
(18:21 +0100)
committer
Lars Op den Kamp
<lars@opdenkamp.eu>
Thu, 12 Jan 2012 17:21:10 +0000
(18:21 +0100)
include/cectypes.h
patch
|
blob
|
blame
|
history
diff --git
a/include/cectypes.h
b/include/cectypes.h
index b8ae24dda13e70102fe705b9534d7603a72af50c..46b25e483324bc6b5b9c536063377915693f539d 100644
(file)
--- a/
include/cectypes.h
+++ b/
include/cectypes.h
@@
-37,9
+37,16
@@
#include <stdint.h>
#include <string.h>
#include <stdint.h>
#include <string.h>
+#if defined(_WIN32) || defined(_WIN64)
+#define CDECL __cdecl
+#else
+#define CDECL
+#endif
+
#if !defined(DECLSPEC)
#if defined(_WIN32) || defined(_WIN64)
#include <windows.h>
#if !defined(DECLSPEC)
#if defined(_WIN32) || defined(_WIN64)
#include <windows.h>
+#define CDECL __cdecl
#if defined DLL_EXPORT
#define DECLSPEC __declspec(dllexport)
#else
#if defined DLL_EXPORT
#define DECLSPEC __declspec(dllexport)
#else
@@
-866,9
+873,10
@@
typedef struct cec_logical_addresses
#endif
} 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 (CDECL* CBCecLogMessageType)(const CEC::cec_log_message &);
+typedef int (CDECL* CBCecKeyPressType)(const cec_keypress &key);
+typedef int (CDECL* CBCecCommandType)(const cec_command &command);
typedef struct ICECCallbacks
{
typedef struct ICECCallbacks
{