Making changes needed to prevent linking errors in other packages. 11/2711/1 accepted/2.0alpha-wayland/20130205.173222 submit/2.0alpha-wayland/20130131.225339
authorbrianjjones <brian.j.jones@intel.com>
Thu, 31 Jan 2013 22:19:31 +0000 (14:19 -0800)
committerbrianjjones <brian.j.jones@intel.com>
Thu, 31 Jan 2013 22:51:20 +0000 (14:51 -0800)
src/lib/ecore_wayland/Ecore_Wayland.h

index c3268b2..af3dac4 100644 (file)
@@ -26,9 +26,6 @@
 #  define EAPI
 # endif
 
-typedef enum _Ecore_Wl_Window_Type Ecore_Wl_Window_Type;
-typedef enum _Ecore_Wl_Window_Buffer_Type Ecore_Wl_Window_Buffer_Type;
-
 typedef struct _Ecore_Wl_Display Ecore_Wl_Display;
 typedef struct _Ecore_Wl_Output Ecore_Wl_Output;
 typedef struct _Ecore_Wl_Input Ecore_Wl_Input;
@@ -52,6 +49,10 @@ typedef struct _Ecore_Wl_Event_Data_Source_Send Ecore_Wl_Event_Data_Source_Send;
 typedef struct _Ecore_Wl_Event_Selection_Data_Ready Ecore_Wl_Event_Selection_Data_Ready; /** @since 1.7 */
 typedef struct _Ecore_Wl_Event_Interfaces_Bound Ecore_Wl_Event_Interfaces_Bound;
 
+#ifdef __cplusplus
+extern "C" {
+#endif // ifdef __cplusplus
+
 enum _Ecore_Wl_Window_Type
 {
    ECORE_WL_WINDOW_TYPE_NONE,
@@ -70,6 +71,9 @@ enum _Ecore_Wl_Window_Buffer_Type
    ECORE_WL_WINDOW_BUFFER_TYPE_SHM
 };
 
+typedef enum _Ecore_Wl_Window_Type Ecore_Wl_Window_Type;
+typedef enum _Ecore_Wl_Window_Buffer_Type Ecore_Wl_Window_Buffer_Type;
+
 struct _Ecore_Wl_Display
 {
    struct 
@@ -387,4 +391,8 @@ EAPI Ecore_Wl_Dnd *ecore_wl_dnd_get();
 EAPI Eina_Bool ecore_wl_dnd_start_drag();
 EAPI Eina_Bool ecore_wl_dnd_selection_has_owner(Ecore_Wl_Dnd *dnd);
 
+#ifdef __cplusplus
+}
+#endif // ifdef __cplusplus
+
 #endif