From 104ff8169d64384dc2a8b17e2c16194ceb20a661 Mon Sep 17 00:00:00 2001 From: Vic Lee Date: Tue, 22 Jan 2013 22:42:01 +0800 Subject: [PATCH] include: add missing extern C decls. --- include/freerdp/addin.h | 8 ++++++++ include/freerdp/graphics.h | 8 ++++++++ include/freerdp/input.h | 8 ++++++++ include/freerdp/peer.h | 8 ++++++++ include/freerdp/primitives.h | 8 ++++++++ include/freerdp/settings.h | 8 ++++++++ 6 files changed, 48 insertions(+) diff --git a/include/freerdp/addin.h b/include/freerdp/addin.h index 8a3dcdc63..dd0758c8e 100644 --- a/include/freerdp/addin.h +++ b/include/freerdp/addin.h @@ -48,6 +48,10 @@ typedef struct _FREERDP_ADDIN FREERDP_ADDIN; typedef void* (*FREERDP_LOAD_CHANNEL_ADDIN_ENTRY_FN)(LPCSTR pszName, LPSTR pszSubsystem, LPSTR pszType, DWORD dwFlags); +#ifdef __cplusplus +extern "C" { +#endif + FREERDP_API LPSTR freerdp_get_library_install_path(); FREERDP_API LPSTR freerdp_get_dynamic_addin_install_path(); @@ -57,5 +61,9 @@ FREERDP_API void* freerdp_load_dynamic_addin(LPCSTR pszFileName, LPCSTR pszPath, FREERDP_API void* freerdp_load_dynamic_channel_addin_entry(LPCSTR pszName, LPSTR pszSubsystem, LPSTR pszType, DWORD dwFlags); FREERDP_API void* freerdp_load_channel_addin_entry(LPCSTR pszName, LPSTR pszSubsystem, LPSTR pszType, DWORD dwFlags); +#ifdef __cplusplus +} +#endif + #endif /* FREERDP_COMMON_ADDIN_H */ diff --git a/include/freerdp/graphics.h b/include/freerdp/graphics.h index 747702e17..3fd9b2c0f 100644 --- a/include/freerdp/graphics.h +++ b/include/freerdp/graphics.h @@ -29,6 +29,10 @@ typedef struct rdp_glyph rdpGlyph; #include #include +#ifdef __cplusplus +extern "C" { +#endif + /* Bitmap Class */ typedef void (*pBitmap_New)(rdpContext* context, rdpBitmap* bitmap); @@ -166,4 +170,8 @@ FREERDP_API void graphics_register_glyph(rdpGraphics* graphics, rdpGlyph* glyph) FREERDP_API rdpGraphics* graphics_new(rdpContext* context); FREERDP_API void graphics_free(rdpGraphics* graphics); +#ifdef __cplusplus +} +#endif + #endif /* FREERDP_GRAPHICS_H */ diff --git a/include/freerdp/input.h b/include/freerdp/input.h index 24d0f90b7..9ea47caab 100644 --- a/include/freerdp/input.h +++ b/include/freerdp/input.h @@ -74,6 +74,10 @@ struct rdp_input UINT32 paddingB[32 - 21]; /* 21 */ }; +#ifdef __cplusplus +extern "C" { +#endif + FREERDP_API void freerdp_input_send_synchronize_event(rdpInput* input, UINT32 flags); FREERDP_API void freerdp_input_send_keyboard_event(rdpInput* input, UINT16 flags, UINT16 code); FREERDP_API void freerdp_input_send_keyboard_event_ex(rdpInput* input, BOOL down, UINT32 rdp_scancode); @@ -81,4 +85,8 @@ FREERDP_API void freerdp_input_send_unicode_keyboard_event(rdpInput* input, UINT FREERDP_API void freerdp_input_send_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y); FREERDP_API void freerdp_input_send_extended_mouse_event(rdpInput* input, UINT16 flags, UINT16 x, UINT16 y); +#ifdef __cplusplus +} +#endif + #endif /* FREERDP_INPUT_H */ diff --git a/include/freerdp/peer.h b/include/freerdp/peer.h index e68708c3e..7c9058b33 100644 --- a/include/freerdp/peer.h +++ b/include/freerdp/peer.h @@ -81,10 +81,18 @@ struct rdp_freerdp_peer SEC_WINNT_AUTH_IDENTITY identity; }; +#ifdef __cplusplus +extern "C" { +#endif + FREERDP_API void freerdp_peer_context_new(freerdp_peer* client); FREERDP_API void freerdp_peer_context_free(freerdp_peer* client); FREERDP_API freerdp_peer* freerdp_peer_new(int sockfd); FREERDP_API void freerdp_peer_free(freerdp_peer* client); +#ifdef __cplusplus +} +#endif + #endif /* FREERDP_PEER_H */ diff --git a/include/freerdp/primitives.h b/include/freerdp/primitives.h index 8da2155d1..917a0159b 100644 --- a/include/freerdp/primitives.h +++ b/include/freerdp/primitives.h @@ -193,6 +193,10 @@ typedef struct void *hints; } primitives_t; +#ifdef __cplusplus +extern "C" { +#endif + /* Prototypes for the externally-visible entrypoints. */ FREERDP_API void primitives_init(void); FREERDP_API primitives_t *primitives_get(void); @@ -204,4 +208,8 @@ FREERDP_API void primitives_flags_str( size_t len); FREERDP_API void primitives_deinit(void); +#ifdef __cplusplus +} +#endif + #endif /* !__PRIMITIVES_H_INCLUDED__ */ diff --git a/include/freerdp/settings.h b/include/freerdp/settings.h index 87606bd56..d6ae91c07 100644 --- a/include/freerdp/settings.h +++ b/include/freerdp/settings.h @@ -970,6 +970,10 @@ struct rdp_settings }; typedef struct rdp_settings rdpSettings; +#ifdef __cplusplus +extern "C" { +#endif + FREERDP_API rdpSettings* freerdp_settings_new(void* instance); FREERDP_API void freerdp_settings_free(rdpSettings* settings); @@ -989,4 +993,8 @@ FREERDP_API void freerdp_dynamic_channel_collection_add(rdpSettings* settings, A FREERDP_API ADDIN_ARGV* freerdp_dynamic_channel_collection_find(rdpSettings* settings, const char* name); FREERDP_API void freerdp_dynamic_channel_collection_free(rdpSettings* settings); +#ifdef __cplusplus +} +#endif + #endif /* FREERDP_SETTINGS_H */