X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkbitmaskprivateimpl.h;h=c0058c77da94bd30866cebf5b59ee301c697b830;hb=894f84c623f2e280376be2945159fbf354377913;hp=e678a81d4448a37256b03227988b10b1b12b5f01;hpb=6044dfc35b3afb77612cc8a3603e1a0092dfd72a;p=~andy%2Fgtk

diff --git a/gtk/gtkbitmaskprivateimpl.h b/gtk/gtkbitmaskprivateimpl.h
index e678a81d4..c0058c77d 100644
--- a/gtk/gtkbitmaskprivateimpl.h
+++ b/gtk/gtkbitmaskprivateimpl.h
@@ -18,7 +18,6 @@
  * Authors: Benjamin Otte <otte@gnome.org>
  */
 
-#include "gtkallocatedbitmaskprivate.h"
 
 static inline GtkBitmask *
 _gtk_bitmask_new (void)
@@ -160,9 +159,9 @@ static inline gboolean
 _gtk_bitmask_intersects (const GtkBitmask *mask,
                          const GtkBitmask *other)
 {
-  if (!_gtk_bitmask_is_allocated (mask) ||
-      !_gtk_bitmask_is_allocated (other))
+  if (_gtk_bitmask_is_allocated (mask) ||
+      _gtk_bitmask_is_allocated (other))
     return _gtk_allocated_bitmask_intersects (mask, other);
   else
-    return _gtk_bitmask_to_bits (mask) & _gtk_bitmask_to_bits (other);
+    return _gtk_bitmask_to_bits (mask) & _gtk_bitmask_to_bits (other) ? TRUE : FALSE;
 }