summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ralls <jralls@ceridwen.us>2012-12-10 16:51:31 -0800
committerJohn Ralls <jralls@ceridwen.us>2012-12-10 16:51:31 -0800
commit796ae50064d5f82afdd36ac0168b350b087e0507 (patch)
tree63294dd463960de5de9eec313c32d5b1c9eb1b3c
parenta3e4fa3809e9281f9dc7e10f37e89e86e0fd219a (diff)
downloadgtk+-796ae50064d5f82afdd36ac0168b350b087e0507.tar.gz
Fix compilation on MacOSX Tiger
NSInteger isn't defined until MacOSX Leopard, so in the 3 files that use it, include ../gdk/quartz/gdkquartz.h which provides a typedef when needed.
-rw-r--r--gtk/gtkclipboard-quartz.c4
-rw-r--r--gtk/gtkdnd-quartz.c1
-rw-r--r--gtk/gtkmodelmenu-quartz.c1
3 files changed, 4 insertions, 2 deletions
diff --git a/gtk/gtkclipboard-quartz.c b/gtk/gtkclipboard-quartz.c
index 046fe71ccf..9179c734dc 100644
--- a/gtk/gtkclipboard-quartz.c
+++ b/gtk/gtkclipboard-quartz.c
@@ -31,7 +31,7 @@
#include "gtktextbuffer.h"
#include "gtkselectionprivate.h"
#include "gtkquartz.h"
-
+#include "../gdk/quartz/gdkquartz.h"
enum {
OWNER_CHANGE,
@@ -47,7 +47,7 @@ enum {
typedef struct _GtkClipboardClass GtkClipboardClass;
-struct _GtkClipboard
+struct _GtkClipboard
{
GObject parent_instance;
diff --git a/gtk/gtkdnd-quartz.c b/gtk/gtkdnd-quartz.c
index 9f13e5fffd..5760105570 100644
--- a/gtk/gtkdnd-quartz.c
+++ b/gtk/gtkdnd-quartz.c
@@ -41,6 +41,7 @@
#include "gtkquartz.h"
#include "gdk/quartz/gdkquartz.h"
#include "gtkselectionprivate.h"
+#include "gtksettings.h"
typedef struct _GtkDragSourceSite GtkDragSourceSite;
typedef struct _GtkDragSourceInfo GtkDragSourceInfo;
diff --git a/gtk/gtkmodelmenu-quartz.c b/gtk/gtkmodelmenu-quartz.c
index a5a73ecdcc..2f05eac7d0 100644
--- a/gtk/gtkmodelmenu-quartz.c
+++ b/gtk/gtkmodelmenu-quartz.c
@@ -23,6 +23,7 @@
#include <gdk/gdkkeysyms.h>
#include "gtkaccelmapprivate.h"
#include "gtkactionhelper.h"
+#include "../gdk/quartz/gdkquartz.h"
#import <Cocoa/Cocoa.h>