[gtk+] Fix compile error from splitting bitmask code
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Fix compile error from splitting bitmask code
- Date: Fri, 2 Mar 2012 00:46:11 +0000 (UTC)
commit b2a8e6ed047db0b306945753e53a534affacd82b
Author: John Ralls <jralls ceridwen us>
Date: Thu Mar 1 12:08:57 2012 -0800
Fix compile error from splitting bitmask code
GtkBitMask was typedef'd twice.
gtk/gtkbitmaskprivate.h | 4 +---
gtk/gtkbitmaskprivateimpl.h | 1 -
2 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkbitmaskprivate.h b/gtk/gtkbitmaskprivate.h
index 5e61c3c..4a255ef 100644
--- a/gtk/gtkbitmaskprivate.h
+++ b/gtk/gtkbitmaskprivate.h
@@ -21,12 +21,10 @@
#define __GTK_BITMASK_PRIVATE_H__
#include <glib.h>
+#include "gtkallocatedbitmaskprivate.h"
G_BEGIN_DECLS
-typedef struct _GtkBitmask GtkBitmask;
-
-
static inline GtkBitmask * _gtk_bitmask_new (void);
static inline GtkBitmask * _gtk_bitmask_copy (const GtkBitmask *mask);
static inline void _gtk_bitmask_free (GtkBitmask *mask);
diff --git a/gtk/gtkbitmaskprivateimpl.h b/gtk/gtkbitmaskprivateimpl.h
index e678a81..0dea65a 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)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]