[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-361-g767c823

[Rob Savoye]

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  767c823e7c5d975962bca7183441332e6f7b54a1 (commit)
      from  7b748152f608770ae37dd692d4a4656f739ce558 (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=767c823e7c5d975962bca7183441332e6f7b54a1


commit 767c823e7c5d975962bca7183441332e6f7b54a1
Author: Rob Savoye <address@hidden>
Date:   Sat May 28 06:19:32 2011 -0600

    only define boolean for jpeg 7

diff --git a/libbase/GnashImageJpeg.cpp b/libbase/GnashImageJpeg.cpp
index dd6bf1c..6860d29 100644
--- a/libbase/GnashImageJpeg.cpp
+++ b/libbase/GnashImageJpeg.cpp
@@ -40,7 +40,7 @@
 // jpeglib.h redefines HAVE_STDLIB_H.
 #undef HAVE_STDLIB_H
 extern "C" {
-#ifdef _WIN32
+#if defined(_WIN32) && JPEG_LIB_VERSION_MAJOR == 7
 typedef int boolean;
 #endif
 # include <jpeglib.h>

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

Summary of changes:
 libbase/GnashImageJpeg.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash