X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkbitmaskprivate.h;h=4a255efa26ec16b741a13bec644289049b560f17;hb=0ba92bc26d1b716f2f9c0543593f13cd5a92c521;hp=adb65cff595144f0bbbde940e4b5ceac7e8895bd;hpb=45b9193290be977aca36e8209cb2c7347fb98a62;p=~andy%2Fgtk

diff --git a/gtk/gtkbitmaskprivate.h b/gtk/gtkbitmaskprivate.h
index adb65cff5..4a255efa2 100644
--- a/gtk/gtkbitmaskprivate.h
+++ b/gtk/gtkbitmaskprivate.h
@@ -12,8 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Benjamin Otte <otte@gnome.org>
  */
@@ -22,46 +21,48 @@
 #define __GTK_BITMASK_PRIVATE_H__
 
 #include <glib.h>
+#include "gtkallocatedbitmaskprivate.h"
 
 G_BEGIN_DECLS
 
-#ifdef GTK_INSIDE_BITMASK_C
-typedef GArray GtkBitmask;
-#else
-typedef struct _GtkBitmask           GtkBitmask;
-#endif
+static inline GtkBitmask *      _gtk_bitmask_new                  (void);
+static inline GtkBitmask *      _gtk_bitmask_copy                 (const GtkBitmask  *mask);
+static inline void              _gtk_bitmask_free                 (GtkBitmask        *mask);
 
+static inline char *            _gtk_bitmask_to_string            (const GtkBitmask  *mask);
+static inline void              _gtk_bitmask_print                (const GtkBitmask  *mask,
+                                                                   GString           *string);
 
-GtkBitmask *   _gtk_bitmask_new                  (void);
-GtkBitmask *   _gtk_bitmask_copy                 (const GtkBitmask  *mask);
-void           _gtk_bitmask_free                 (GtkBitmask        *mask);
+static inline GtkBitmask *      _gtk_bitmask_intersect            (GtkBitmask        *mask,
+                                                                   const GtkBitmask  *other) G_GNUC_WARN_UNUSED_RESULT;
+static inline GtkBitmask *      _gtk_bitmask_union                (GtkBitmask        *mask,
+                                                                   const GtkBitmask  *other) G_GNUC_WARN_UNUSED_RESULT;
+static inline GtkBitmask *      _gtk_bitmask_subtract             (GtkBitmask        *mask,
+                                                                   const GtkBitmask  *other) G_GNUC_WARN_UNUSED_RESULT;
 
-char *         _gtk_bitmask_to_string            (const GtkBitmask  *mask);
-void           _gtk_bitmask_print                (const GtkBitmask  *mask,
-                                                  GString           *string);
+static inline gboolean          _gtk_bitmask_get                  (const GtkBitmask  *mask,
+                                                                   guint              index_);
+static inline GtkBitmask *      _gtk_bitmask_set                  (GtkBitmask        *mask,
+                                                                   guint              index_,
+                                                                   gboolean           value) G_GNUC_WARN_UNUSED_RESULT;
 
-void           _gtk_bitmask_intersect            (GtkBitmask        *mask,
-                                                  const GtkBitmask  *other);
-void           _gtk_bitmask_union                (GtkBitmask        *mask,
-                                                  const GtkBitmask  *other);
-void           _gtk_bitmask_subtract             (GtkBitmask        *mask,
-                                                  const GtkBitmask  *other);
+static inline GtkBitmask *      _gtk_bitmask_invert_range         (GtkBitmask        *mask,
+                                                                   guint              start,
+                                                                   guint              end) G_GNUC_WARN_UNUSED_RESULT;
 
-gboolean       _gtk_bitmask_get                  (const GtkBitmask  *mask,
-                                                  guint              index_);
-void           _gtk_bitmask_set                  (GtkBitmask        *mask,
-                                                  guint              index_,
-                                                  gboolean           value);
+static inline gboolean          _gtk_bitmask_is_empty             (const GtkBitmask  *mask);
+static inline gboolean          _gtk_bitmask_equals               (const GtkBitmask  *mask,
+                                                                   const GtkBitmask  *other);
+static inline gboolean          _gtk_bitmask_intersects           (const GtkBitmask  *mask,
+                                                                   const GtkBitmask  *other);
 
-void           _gtk_bitmask_invert_range         (GtkBitmask        *mask,
-                                                  guint              start,
-                                                  guint              end);
 
-gboolean       _gtk_bitmask_is_empty             (const GtkBitmask  *mask);
-gboolean       _gtk_bitmask_equals               (const GtkBitmask  *mask,
-                                                  const GtkBitmask  *other);
-gboolean       _gtk_bitmask_intersects           (const GtkBitmask  *mask,
-                                                  const GtkBitmask  *other);
+/* This is the actual implementation of the functions declared above.
+ * We put it in a separate file so people don't get scared from looking at this
+ * file when reading source code.
+ */
+#include "gtkbitmaskprivateimpl.h"
+
 
 G_END_DECLS