From f24cd91bae25bbdfe9bbdc8bbc1bd216f1f46eda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <marcandre.moreau@gmail.com>
Date: Mon, 14 Oct 2013 23:34:35 -0400
Subject: [PATCH] libfreerdp-rail: fix C++ inclusion of header files

---
 include/freerdp/rail/icon.h        | 16 ++++++++++++----
 include/freerdp/rail/rail.h        |  8 ++++++++
 include/freerdp/rail/window.h      |  8 ++++++++
 include/freerdp/rail/window_list.h |  8 ++++++++
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/include/freerdp/rail/icon.h b/include/freerdp/rail/icon.h
index 109750afc..cfd960183 100644
--- a/include/freerdp/rail/icon.h
+++ b/include/freerdp/rail/icon.h
@@ -53,10 +53,18 @@ struct rdp_icon_cache
 	WINDOW_ICON_CACHE* caches;
 };
 
-ICON_INFO* icon_cache_get(rdpIconCache* cache, BYTE id, UINT16 index, void** extra);
-void icon_cache_put(rdpIconCache* cache, BYTE id, UINT16 index, ICON_INFO* entry, void* extra);
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-rdpIconCache* icon_cache_new(rdpRail* rail);
-void icon_cache_free(rdpIconCache* cache);
+FREERDP_API ICON_INFO* icon_cache_get(rdpIconCache* cache, BYTE id, UINT16 index, void** extra);
+FREERDP_API void icon_cache_put(rdpIconCache* cache, BYTE id, UINT16 index, ICON_INFO* entry, void* extra);
+
+FREERDP_API rdpIconCache* icon_cache_new(rdpRail* rail);
+FREERDP_API void icon_cache_free(rdpIconCache* cache);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* FREERDP_RAIL_ICON_CACHE_H */
diff --git a/include/freerdp/rail/rail.h b/include/freerdp/rail/rail.h
index cb8340717..d3c75d9ff 100644
--- a/include/freerdp/rail/rail.h
+++ b/include/freerdp/rail/rail.h
@@ -61,9 +61,17 @@ struct rdp_rail
 	railDesktopNonMonitored rail_DesktopNonMonitored;
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 FREERDP_API void rail_register_update_callbacks(rdpRail* rail, rdpUpdate* update);
 
 FREERDP_API rdpRail* rail_new(rdpSettings* settings);
 FREERDP_API void rail_free(rdpRail* rail);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_RAIL_H */
diff --git a/include/freerdp/rail/window.h b/include/freerdp/rail/window.h
index 0514951cb..3c3a955dc 100644
--- a/include/freerdp/rail/window.h
+++ b/include/freerdp/rail/window.h
@@ -68,10 +68,18 @@ struct rdp_window
 	RECTANGLE_16* visibilityRects;
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 FREERDP_API void window_state_update(rdpWindow* window, WINDOW_ORDER_INFO* orderInfo, WINDOW_STATE_ORDER* window_state);
 
 FREERDP_API void rail_CreateWindow(rdpRail* rail, rdpWindow* window);
 FREERDP_API void rail_UpdateWindow(rdpRail* rail, rdpWindow* window);
 FREERDP_API void rail_DestroyWindow(rdpRail* rail, rdpWindow* window);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_RAIL_WINDOW_H */
diff --git a/include/freerdp/rail/window_list.h b/include/freerdp/rail/window_list.h
index 615c94ded..76375dbb2 100644
--- a/include/freerdp/rail/window_list.h
+++ b/include/freerdp/rail/window_list.h
@@ -39,6 +39,10 @@ struct rdp_window_list
 	rdpWindow* iterator;
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 FREERDP_API void window_list_rewind(rdpWindowList* list);
 FREERDP_API BOOL window_list_has_next(rdpWindowList* list);
 FREERDP_API rdpWindow* window_list_get_next(rdpWindowList* list);
@@ -54,4 +58,8 @@ FREERDP_API void window_list_clear(rdpWindowList* list);
 FREERDP_API rdpWindowList* window_list_new(rdpRail* rail);
 FREERDP_API void window_list_free(rdpWindowList* list);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* FREERDP_RAIL_WINDOW_LIST_H */