From ba4b00be42874e3a1af59efaf5426b20ead7519b Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Wed, 10 Feb 2010 18:18:30 +0000
Subject: [PATCH] cogl: remove redundant _cogl_journal_flush prototype

There was a redundant _cogl_journal_flush function prototype in
cogl-primitives.h
---
 cogl/cogl-clip-stack.c        | 1 +
 cogl/cogl-framebuffer.c       | 1 +
 cogl/cogl-journal-private.h   | 5 +++--
 cogl/cogl-material.c          | 1 +
 cogl/cogl-primitives.h        | 3 ---
 cogl/cogl-texture-2d-sliced.c | 1 +
 cogl/cogl-texture-2d.c        | 1 +
 cogl/cogl-vertex-buffer.c     | 1 +
 cogl/driver/gl/cogl-program.c | 1 +
 9 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/cogl/cogl-clip-stack.c b/cogl/cogl-clip-stack.c
index d7ad1d1c6..3f64047a0 100644
--- a/cogl/cogl-clip-stack.c
+++ b/cogl/cogl-clip-stack.c
@@ -36,6 +36,7 @@
 #include "cogl-context.h"
 #include "cogl-internal.h"
 #include "cogl-framebuffer-private.h"
+#include "cogl-journal-private.h"
 
 void _cogl_add_path_to_stencil_buffer (floatVec2    nodes_min,
                                        floatVec2    nodes_max,
diff --git a/cogl/cogl-framebuffer.c b/cogl/cogl-framebuffer.c
index 8124186d0..2b35e1114 100644
--- a/cogl/cogl-framebuffer.c
+++ b/cogl/cogl-framebuffer.c
@@ -33,6 +33,7 @@
 #include "cogl-texture-private.h"
 #include "cogl-framebuffer-private.h"
 #include "cogl-clip-stack.h"
+#include "cogl-journal-private.h"
 
 #ifdef HAVE_COGL_GLES2
 
diff --git a/cogl/cogl-journal-private.h b/cogl/cogl-journal-private.h
index a410c8ff0..bc5f835cf 100644
--- a/cogl/cogl-journal-private.h
+++ b/cogl/cogl-journal-private.h
@@ -40,8 +40,6 @@ typedef struct _CoglJournalEntry
    * later. */
 } CoglJournalEntry;
 
-void _cogl_journal_flush (void);
-
 void
 _cogl_journal_log_quad (float         x_1,
                         float         y_1,
@@ -54,4 +52,7 @@ _cogl_journal_log_quad (float         x_1,
                         const float  *tex_coords,
                         unsigned int  tex_coords_len);
 
+void
+_cogl_journal_flush (void);
+
 #endif /* __COGL_JOURNAL_PRIVATE_H */
diff --git a/cogl/cogl-material.c b/cogl/cogl-material.c
index a9661e4f2..cddac7f6a 100644
--- a/cogl/cogl-material.c
+++ b/cogl/cogl-material.c
@@ -36,6 +36,7 @@
 #include "cogl-material-private.h"
 #include "cogl-texture-private.h"
 #include "cogl-blend-string.h"
+#include "cogl-journal-private.h"
 
 #include <glib.h>
 #include <string.h>
diff --git a/cogl/cogl-primitives.h b/cogl/cogl-primitives.h
index 0d465d1a6..5978a26b9 100644
--- a/cogl/cogl-primitives.h
+++ b/cogl/cogl-primitives.h
@@ -57,7 +57,4 @@ struct _CoglBezCubic
   floatVec2 p4;
 };
 
-void
-_cogl_journal_flush (void);
-
 #endif /* __COGL_PRIMITIVES_H */
diff --git a/cogl/cogl-texture-2d-sliced.c b/cogl/cogl-texture-2d-sliced.c
index 1ba3f4cb6..0f9e65f22 100644
--- a/cogl/cogl-texture-2d-sliced.c
+++ b/cogl/cogl-texture-2d-sliced.c
@@ -41,6 +41,7 @@
 #include "cogl-context.h"
 #include "cogl-handle.h"
 #include "cogl-spans.h"
+#include "cogl-journal-private.h"
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/cogl/cogl-texture-2d.c b/cogl/cogl-texture-2d.c
index 4c5ffdaf3..34d901e0a 100644
--- a/cogl/cogl-texture-2d.c
+++ b/cogl/cogl-texture-2d.c
@@ -36,6 +36,7 @@
 #include "cogl-texture-driver.h"
 #include "cogl-context.h"
 #include "cogl-handle.h"
+#include "cogl-journal-private.h"
 
 #include <string.h>
 #include <math.h>
diff --git a/cogl/cogl-vertex-buffer.c b/cogl/cogl-vertex-buffer.c
index f289dfacc..043448ed8 100644
--- a/cogl/cogl-vertex-buffer.c
+++ b/cogl/cogl-vertex-buffer.c
@@ -139,6 +139,7 @@
 #include "cogl-material-private.h"
 #include "cogl-primitives.h"
 #include "cogl-framebuffer-private.h"
+#include "cogl-journal-private.h"
 
 #define PAD_FOR_ALIGNMENT(VAR, TYPE_SIZE) \
   (VAR = TYPE_SIZE + ((VAR - 1) & ~(TYPE_SIZE - 1)))
diff --git a/cogl/driver/gl/cogl-program.c b/cogl/driver/gl/cogl-program.c
index 39b096a46..aea9c553a 100644
--- a/cogl/driver/gl/cogl-program.c
+++ b/cogl/driver/gl/cogl-program.c
@@ -31,6 +31,7 @@
 #include "cogl-internal.h"
 #include "cogl-handle.h"
 #include "cogl-context.h"
+#include "cogl-journal-private.h"
 
 #include <glib.h>