From c80a104349b9e0fc181aa04a04f4b66dc65e17fc Mon Sep 17 00:00:00 2001 From: Jean Guyomarc'h Date: Wed, 14 Oct 2015 09:08:38 +0200 Subject: [PATCH] ecore_cocoa: prevent Ecore_Cocoa_Window to be re-defined Change-Id: I40f88728e0a22d75a189b36e17eb2f6127ca59c3 Signed-off-by: Cedric BAIL --- src/lib/ecore_cocoa/Ecore_Cocoa.h | 2 ++ src/lib/ecore_evas/Ecore_Evas_Types.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/lib/ecore_cocoa/Ecore_Cocoa.h b/src/lib/ecore_cocoa/Ecore_Cocoa.h index 27ae045..106b347 100644 --- a/src/lib/ecore_cocoa/Ecore_Cocoa.h +++ b/src/lib/ecore_cocoa/Ecore_Cocoa.h @@ -43,7 +43,9 @@ extern "C" { * @typedef Ecore_Cocoa_Window * Opaque handler to manipulate a Cocoa Window through Ecore */ +#ifndef _ECORE_COCOA_WINDOW_PREDEF typedef struct _Ecore_Cocoa_Window Ecore_Cocoa_Window; +#endif /* ! _ECORE_COCOA_WINDOW_PREDEF */ /** * @typedef Ecore_Cocoa_Screen diff --git a/src/lib/ecore_evas/Ecore_Evas_Types.h b/src/lib/ecore_evas/Ecore_Evas_Types.h index eea8aa7..08d6d58 100644 --- a/src/lib/ecore_evas/Ecore_Evas_Types.h +++ b/src/lib/ecore_evas/Ecore_Evas_Types.h @@ -33,6 +33,7 @@ typedef struct _Ecore_WinCE_Window Ecore_WinCE_Window; #endif #ifndef __ECORE_COCOA_H__ +# define _ECORE_COCOA_WINDOW_PREDEF typedef struct _Ecore_Cocoa_Window Ecore_Cocoa_Window; #endif -- 2.7.4