[Gnash-commit] [SCM] Gnash branch, master, updated. 10521c16178bb977e150540ef62a73e76bc22507

[Benjamin Wolsey]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  10521c16178bb977e150540ef62a73e76bc22507 (commit)
      from  53c8b87b1950d35a6c00c4904e390ce6afb084be (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=10521c16178bb977e150540ef62a73e76bc22507


commit 10521c16178bb977e150540ef62a73e76bc22507
Author: Benjamin Wolsey <address@hidden>
Date:   Thu Sep 9 14:26:17 2010 +0200

    Rearrange includes (duplicate definition on w32)

diff --git a/libcore/swf/tag_loaders.cpp b/libcore/swf/tag_loaders.cpp
index 7a80408..ad0e6a3 100644
--- a/libcore/swf/tag_loaders.cpp
+++ b/libcore/swf/tag_loaders.cpp
@@ -31,14 +31,11 @@
 #include <boost/static_assert.hpp>
 
 #include "IOChannel.h"
-#include "GnashImage.h"
-#include "GnashImageJpeg.h"
 #include "utility.h"
 #include "action_buffer.h"
 #include "Font.h"
 #include "log.h"
 #include "SWFStream.h"
-#include "GnashImage.h"
 #include "zlib_adapter.h"
 #include "sprite_definition.h"
 #include "MovieClip.h"
@@ -58,6 +55,8 @@
 #include "Renderer.h"
 #include "Movie.h"
 #include "CachedBitmap.h"
+#include "GnashImage.h"
+#include "GnashImageJpeg.h"
 
 #ifdef HAVE_ZLIB_H
 #include <zlib.h>

-----------------------------------------------------------------------

Summary of changes:
 libcore/swf/tag_loaders.cpp |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Gnash