From 830858b9f72fef55d3617bda439d5b3999b4a0b0 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Thu, 29 Nov 2012 06:43:44 +0000 Subject: [PATCH] Ecore: more __UNUSED__ fixes SVN revision: 79812 --- .../ecore/src/lib/ecore_wayland/ecore_wl_private.h | 10 +++++----- .../lib/ecore_win32/ecore_win32_dnd_data_object.cpp | 12 ++++++------ .../lib/ecore_win32/ecore_win32_dnd_drop_source.cpp | 2 +- .../lib/ecore_win32/ecore_win32_dnd_drop_target.cpp | 2 +- legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h | 10 +++++----- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_private.h b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_private.h index 7f59ae9bcd..ecd7a110b3 100644 --- a/legacy/ecore/src/lib/ecore_wayland/ecore_wl_private.h +++ b/legacy/ecore/src/lib/ecore_wayland/ecore_wl_private.h @@ -92,11 +92,11 @@ void _ecore_wl_input_pointer_xy_get(int *x, int *y); void _ecore_wl_input_set_selection(Ecore_Wl_Input *input, struct wl_data_source *source); void _ecore_wl_dnd_add(Ecore_Wl_Input *input, struct wl_data_device *data_device, struct wl_data_offer *offer); -void _ecore_wl_dnd_enter(void *data, struct wl_data_device *data_device __UNUSED__, unsigned int timestamp __UNUSED__, struct wl_surface *surface, int x, int y, struct wl_data_offer *offer); -void _ecore_wl_dnd_leave(void *data, struct wl_data_device *data_device __UNUSED__); -void _ecore_wl_dnd_motion(void *data, struct wl_data_device *data_device __UNUSED__, unsigned int timestamp __UNUSED__, int x, int y); -void _ecore_wl_dnd_drop(void *data, struct wl_data_device *data_device __UNUSED__); -void _ecore_wl_dnd_selection(void *data, struct wl_data_device *data_device __UNUSED__, struct wl_data_offer *offer); +void _ecore_wl_dnd_enter(void *data, struct wl_data_device *data_device, unsigned int timestamp, struct wl_surface *surface, int x, int y, struct wl_data_offer *offer); +void _ecore_wl_dnd_leave(void *data, struct wl_data_device *data_device); +void _ecore_wl_dnd_motion(void *data, struct wl_data_device *data_device, unsigned int timestamp, int x, int y); +void _ecore_wl_dnd_drop(void *data, struct wl_data_device *data_device); +void _ecore_wl_dnd_selection(void *data, struct wl_data_device *data_device, struct wl_data_offer *offer); void _ecore_wl_dnd_del(Ecore_Wl_Dnd_Source *source); struct wl_data_source *_ecore_wl_create_data_source(Ecore_Wl_Display *ewd); diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp b/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp index 75e26f5c90..213197780b 100644 --- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp +++ b/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_data_object.cpp @@ -119,7 +119,7 @@ HRESULT DataObject::GetData(FORMATETC *pFormatEtc, STGMEDIUM *pMedium) return S_OK; } -HRESULT DataObject::GetDataHere(FORMATETC *pFormatEtc __UNUSED__, STGMEDIUM *pmedium __UNUSED__) +HRESULT DataObject::GetDataHere(FORMATETC *pFormatEtc EINA_UNUSED, STGMEDIUM *pmedium EINA_UNUSED) { return DATA_E_FORMATETC; } @@ -129,14 +129,14 @@ HRESULT DataObject::QueryGetData(FORMATETC *pFormatEtc) return (lookup_format_etc(pFormatEtc) == -1) ? DV_E_FORMATETC : S_OK; } -HRESULT DataObject::GetCanonicalFormatEtc(FORMATETC *pFormatEct __UNUSED__, FORMATETC *pFormatEtcOut) +HRESULT DataObject::GetCanonicalFormatEtc(FORMATETC *pFormatEct EINA_UNUSED, FORMATETC *pFormatEtcOut) { // Apparently we have to set this field to NULL even though we don't do anything else pFormatEtcOut->ptd = NULL; return E_NOTIMPL; } -HRESULT DataObject::SetData(FORMATETC *pFormatEtc __UNUSED__, STGMEDIUM *pMedium __UNUSED__, BOOL fRelease __UNUSED__) +HRESULT DataObject::SetData(FORMATETC *pFormatEtc EINA_UNUSED, STGMEDIUM *pMedium EINA_UNUSED, BOOL fRelease EINA_UNUSED) { return E_NOTIMPL; } @@ -157,17 +157,17 @@ HRESULT DataObject::EnumFormatEtc(DWORD dwDirection, IEnumFORMATETC **ppEnumForm } } -HRESULT DataObject::DAdvise(FORMATETC *pFormatEtc __UNUSED__, DWORD advf __UNUSED__, IAdviseSink *, DWORD *) +HRESULT DataObject::DAdvise(FORMATETC *pFormatEtc EINA_UNUSED, DWORD advf EINA_UNUSED, IAdviseSink *, DWORD *) { return OLE_E_ADVISENOTSUPPORTED; } -HRESULT DataObject::DUnadvise(DWORD dwConnection __UNUSED__) +HRESULT DataObject::DUnadvise(DWORD dwConnection EINA_UNUSED) { return OLE_E_ADVISENOTSUPPORTED; } -HRESULT DataObject::EnumDAdvise(IEnumSTATDATA **ppEnumAdvise __UNUSED__) +HRESULT DataObject::EnumDAdvise(IEnumSTATDATA **ppEnumAdvise EINA_UNUSED) { return OLE_E_ADVISENOTSUPPORTED; } diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp b/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp index bea7736b7d..a3a8bb1865 100644 --- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp +++ b/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_source.cpp @@ -67,7 +67,7 @@ HRESULT DropSource::QueryContinueDrag(BOOL fEscapePressed, DWORD grfKeyState) return S_OK; } -HRESULT DropSource::GiveFeedback(DWORD dwEffect __UNUSED__) +HRESULT DropSource::GiveFeedback(DWORD dwEffect EINA_UNUSED) { return DRAGDROP_S_USEDEFAULTCURSORS; } diff --git a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp b/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp index e19fb5d242..2f2da1af65 100644 --- a/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp +++ b/legacy/ecore/src/lib/ecore_win32/ecore_win32_dnd_drop_target.cpp @@ -152,7 +152,7 @@ HRESULT DropTarget::Drop(IDataObject *pDataObject, DWORD grfKeyState, POINTL pt, // internal helper function -DWORD DropTarget::DropEffect(DWORD grfKeyState, POINTL pt __UNUSED__, DWORD dwAllowed) +DWORD DropTarget::DropEffect(DWORD grfKeyState, POINTL pt EINA_UNUSED, DWORD dwAllowed) { DWORD dwEffect = 0; diff --git a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h index dfb5fbc70d..240210ca0d 100644 --- a/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h +++ b/legacy/ecore/src/lib/ecore_x/xcb/ecore_xcb_private.h @@ -417,7 +417,7 @@ void _ecore_xcb_input_shutdown(void); # ifdef ECORE_XCB_XINPUT void _ecore_xcb_input_handle_event(xcb_generic_event_t *event); # else -void _ecore_xcb_input_handle_event(xcb_generic_event_t *event __UNUSED__); +void _ecore_xcb_input_handle_event(xcb_generic_event_t *event); # endif void _ecore_xcb_dri_init(void); @@ -439,10 +439,10 @@ void _ecore_xcb_window_grab_allow_events(Ecore_X_Window event_win, void *event, Ecore_X_Time timestamp); -int _ecore_xcb_netwm_startup_info_begin(Ecore_X_Window win __UNUSED__, - uint8_t data __UNUSED__); -int _ecore_xcb_netwm_startup_info(Ecore_X_Window win __UNUSED__, - uint8_t data __UNUSED__); +int _ecore_xcb_netwm_startup_info_begin(Ecore_X_Window win, + uint8_t data); +int _ecore_xcb_netwm_startup_info(Ecore_X_Window win, + uint8_t data); Ecore_X_Window_State _ecore_xcb_netwm_window_state_get(Ecore_X_Atom atom); int _ecore_xcb_error_handle(xcb_generic_error_t *err);