4 files changed, 11 insertions, 11 deletions

diff --git a/extern/xdnd/xdnd.c b/extern/xdnd/xdnd.c
index 50d1fec4969..e8c51377e27 100644
--- a/extern/xdnd/xdnd.c
+++ b/extern/xdnd/xdnd.c
@@ -121,10 +121,10 @@ char *xdnd_debug_milliseconds (void)
 #define dnd_debug3(a,b,c)   printf("%s: %d: %s: " a "\n", __FILE__, __LINE__, xdnd_debug_milliseconds (), b, c)
 #define dnd_debug4(a,b,c,d) printf("%s: %d: %s: " a "\n", __FILE__, __LINE__, xdnd_debug_milliseconds (), b, c, d)
 #else
-#define dnd_debug1(a)       
-#define dnd_debug2(a,b)     
-#define dnd_debug3(a,b,c)   
-#define dnd_debug4(a,b,c,d) 
+#define dnd_debug1(a)       do {} while (0)
+#define dnd_debug2(a,b)     do {} while (0)
+#define dnd_debug3(a,b,c)   do {} while (0)
+#define dnd_debug4(a,b,c,d) do {} while (0)
 #endif
 
 #define dnd_warning(a) fprintf (stderr, a)
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 4d7533d575c..8c9182abad0 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -961,7 +961,7 @@ static void screen_cursor_set(wmWindow *win, const int xy[2])
 	ScrArea *sa;
 
 	for (sa = screen->areabase.first; sa; sa = sa->next)
-		if ((az = is_in_area_actionzone(sa, xy)))
+		if ((az = ED_area_actionzone_find_xy(sa, xy)))
 			break;
 
 	if (sa) {
@@ -1003,7 +1003,7 @@ void ED_screen_set_active_region(bContext *C, wmWindow *win, const int xy[2])
 		ED_screen_areas_iter(win, scr, area_iter) {
 			if (xy[0] > area_iter->totrct.xmin && xy[0] < area_iter->totrct.xmax) {
 				if (xy[1] > area_iter->totrct.ymin && xy[1] < area_iter->totrct.ymax) {
-					if (is_in_area_actionzone(area_iter, xy) == NULL) {
+					if (ED_area_actionzone_find_xy(area_iter, xy) == NULL) {
 						sa = area_iter;
 						break;
 					}
@@ -1073,7 +1073,7 @@ int ED_screen_area_active(const bContext *C)
 	ScrArea *sa = CTX_wm_area(C);
 
 	if (win && sc && sa) {
-		AZone *az = is_in_area_actionzone(sa, &win->eventstate->x);
+		AZone *az = ED_area_actionzone_find_xy(sa, &win->eventstate->x);
 		ARegion *ar;
 
 		if (az && az->type == AZONE_REGION)
diff --git a/source/blender/editors/screen/screen_intern.h b/source/blender/editors/screen/screen_intern.h
index b02198764e0..89c2b1563c4 100644
--- a/source/blender/editors/screen/screen_intern.h
+++ b/source/blender/editors/screen/screen_intern.h
@@ -67,7 +67,7 @@ ScrEdge    *screen_find_active_scredge(
         const wmWindow *win, const bScreen *screen,
         const int mx, const int my);
 
-struct AZone *is_in_area_actionzone(ScrArea *sa, const int xy[2]);
+struct AZone *ED_area_actionzone_find_xy(ScrArea *sa, const int xy[2]);
 
 /* screen_context.c */
 int ed_screen_context(
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index c2dab7e22dd..df52ce696d9 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -669,7 +669,7 @@ static void fullscreen_click_rcti_init(rcti *rect, const short x1, const short y
 	BLI_rcti_init(rect, x, x + icon_size, y, y + icon_size);
 }
 
-AZone *is_in_area_actionzone(ScrArea *sa, const int xy[2])
+AZone *ED_area_actionzone_find_xy(ScrArea *sa, const int xy[2])
 {
 	AZone *az = NULL;
 
@@ -817,7 +817,7 @@ static void actionzone_apply(bContext *C, wmOperator *op, int type)
 static int actionzone_invoke(bContext *C, wmOperator *op, const wmEvent *event)
 {
 	ScrArea *sa = CTX_wm_area(C);
-	AZone *az = is_in_area_actionzone(sa, &event->x);
+	AZone *az = ED_area_actionzone_find_xy(sa, &event->x);
 	sActionzoneData *sad;
 
 	/* quick escape */
@@ -878,7 +878,7 @@ static int actionzone_modal(bContext *C, wmOperator *op, const wmEvent *event)
 				WM_window_screen_rect_calc(win, &screen_rect);
 				/* once we drag outside the actionzone, register a gesture
 				 * check we're not on an edge so join finds the other area */
-				is_gesture = ((is_in_area_actionzone(sad->sa1, &event->x) != sad->az) &&
+				is_gesture = ((ED_area_actionzone_find_xy(sad->sa1, &event->x) != sad->az) &&
 				              (screen_area_map_find_active_scredge(
 				                   AREAMAP_FROM_SCREEN(sc), &screen_rect, event->x, event->y) == NULL));
 			}