gimp r24563 - in trunk: . app/core app/gegl/gegl

[mitch svn gnome org]

Author: mitch
Date: Mon Jan  7 20:32:20 2008
New Revision: 24563
URL: http://svn.gnome.org/viewvc/gimp?rev=24563&view=rev

Log:
2008-01-07  Michael Natterer  <mitch gimp org>

	* app/core/core-types.h: include gegl/gegl-types.h instead of
	base/base-types.h.

	* app/gegl/gegl/gegl-types.h: add ugly #ifdefs so we can include
	gegl.h and this file at the same time.



Modified:
   trunk/ChangeLog
   trunk/app/core/core-types.h
   trunk/app/gegl/gegl/gegl-types.h

Modified: trunk/app/core/core-types.h
==============================================================================
--- trunk/app/core/core-types.h	(original)
+++ trunk/app/core/core-types.h	Mon Jan  7 20:32:20 2008
@@ -23,7 +23,7 @@
 #include "libgimpmodule/gimpmoduletypes.h"
 #include "libgimpthumb/gimpthumb-types.h"
 
-#include "base/base-types.h"
+#include "gegl/gegl-types.h"
 
 #include "core/core-enums.h"
 

Modified: trunk/app/gegl/gegl/gegl-types.h
==============================================================================
--- trunk/app/gegl/gegl/gegl-types.h	(original)
+++ trunk/app/gegl/gegl/gegl-types.h	Mon Jan  7 20:32:20 2008
@@ -23,8 +23,10 @@
 G_BEGIN_DECLS
 
 typedef struct _GeglConnection       GeglConnection;
+#ifndef __GEGL_H__
 typedef struct _GeglColor            GeglColor;
 typedef struct _GeglCurve            GeglCurve;
+#endif
 typedef struct _GeglCRVisitor        GeglCRVisitor;
 typedef struct _GeglDebugRectVisitor GeglDebugRectVisitor;
 typedef struct _GeglEvalMgr          GeglEvalMgr;
@@ -33,20 +35,27 @@
 typedef struct _GeglGraph            GeglGraph;
 typedef struct _GeglHaveVisitor      GeglHaveVisitor;
 typedef struct _GeglNeedVisitor      GeglNeedVisitor;
+#ifndef __GEGL_H__
 typedef struct _GeglNode             GeglNode;
+#endif
 typedef struct _GeglNodeContext      GeglNodeContext;
 typedef struct _GeglOperation        GeglOperation;
 typedef struct _GeglPad              GeglPad;
+#ifndef __GEGL_H__
 typedef struct _GeglVector           GeglVector;
 typedef struct _GeglProcessor        GeglProcessor;
+#endif
 typedef struct _GeglPrepareVisitor   GeglPrepareVisitor;
 typedef struct _GeglVisitable        GeglVisitable; /* dummy typedef */
 typedef struct _GeglVisitor          GeglVisitor;
 
+#ifndef __GEGL_H__
 typedef struct _GeglRectangle        GeglRectangle;
+#endif
 typedef struct _GeglPoint            GeglPoint;
 typedef struct _GeglDimension        GeglDimension;
 
+#ifndef __GEGL_H__
 struct _GeglRectangle
 {
   gint x;
@@ -54,6 +63,7 @@
   gint width;
   gint height;
 };
+#endif
 
 struct _GeglPoint
 {