[gtk+/rendering-cleanup: 62/65] x11: Don't include gdkprivate.h in gdkx.h
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/rendering-cleanup: 62/65] x11: Don't include gdkprivate.h in gdkx.h
- Date: Thu, 2 Dec 2010 11:56:39 +0000 (UTC)
commit 7f57fdc718644fe7ef3a92aac7fa9b96a5902241
Author: Benjamin Otte <otte redhat com>
Date: Tue Nov 30 22:55:44 2010 +0100
x11: Don't include gdkprivate.h in gdkx.h
It's private, mkay?
And include it directly where we need it anyway.
gdk/x11/gdkx.h | 3 ++-
gtk/gtksocket-x11.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index bf1f097..5db972c 100644
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -27,7 +27,8 @@
#ifndef __GDK_X_H__
#define __GDK_X_H__
-#include <gdk/gdkprivate.h>
+#include <gdk/gdk.h>
+
#include <X11/Xlib.h>
#include <X11/Xutil.h>
diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c
index c5f2824..963d832 100644
--- a/gtk/gtksocket-x11.c
+++ b/gtk/gtksocket-x11.c
@@ -39,7 +39,8 @@
#include "gtkdnd.h"
#include "gtkdebug.h"
-#include "x11/gdkx.h"
+#include "gdk/x11/gdkx.h"
+#include "gdk/gdkprivate.h"
#ifdef HAVE_XFIXES
#include <X11/extensions/Xfixes.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]