2.18.1 directfb breakage

["Woodward, Jason" <jason woodward timesys com>]

building 2.18.1 with directfb fails with

gdkwindow-directfb.c:2077: error: conflicting types for '_gdk_windowing_window_at_pointer'
../../gdk/gdkinternals.h:460: note: previous declaration of '_gdk_windowing_window_at_pointer' was here
gdkwindow-directfb.c: In function '_gdk_windowing_window_at_pointer':
gdkwindow-directfb.c:2102: error: 'get_toplevel' undeclared (first use in this function)
gdkwindow-directfb.c:2102: error: (Each undeclared identifier is reported only once
gdkwindow-directfb.c:2102: error: for each function it appears in.)
make[5]: *** [gdkwindow-directfb.lo] Error 1




--- gtk+-2.18.1/gdk/directfb/gdkwindow-directfb.c.orig  2009-10-01 12:25:20.000000000 -0400
+++ gtk+-2.18.1/gdk/directfb/gdkwindow-directfb.c       2009-10-01 12:25:13.000000000 -0400
@@ -2077,7 +2077,8 @@
 _gdk_windowing_window_at_pointer (GdkDisplay *display,
                                   gint       *win_x,
                                  gint       *win_y,
-                                  GdkModifierType *mask)
+                                 GdkModifierType *mask,
+                                 gboolean   get_toplevel)
 { 
   GdkWindow *retval;
   gint       wx, wy;
@@ -2137,7 +2138,8 @@
   gdk_directfb_window_get_pointer (_gdk_windowing_window_at_pointer (display,
                                                                      NULL,
                                                                      NULL,
-                                                                     NULL),
+                                                                     NULL,
+                                                                     FALSE),
                                    x, y, mask);
 }