[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1451-gf8d9006

[Bastiaan Jacques]

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  f8d900660b94ab25039c06841549ffefabce06ba (commit)
       via  39fcd5139996c6d07d659c5b771f0e84711f9c46 (commit)
      from  4d10f1e19a8e4098c06d22096cd0be9d3fe68822 (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=f8d900660b94ab25039c06841549ffefabce06ba


commit f8d900660b94ab25039c06841549ffefabce06ba
Merge: 39fcd51 4d10f1e
Author: Bastiaan Jacques <address@hidden>
Date:   Mon Mar 26 13:17:56 2012 +0200

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=39fcd5139996c6d07d659c5b771f0e84711f9c46


commit 39fcd5139996c6d07d659c5b771f0e84711f9c46
Author: Bastiaan Jacques <address@hidden>
Date:   Mon Mar 26 13:08:34 2012 +0200

    Allow compilation with GCC-4.7.
    
    Fewer system headers include <stdio.h> since 4.7, according to the release
    changes list:
    
      "Avoid polluting the global namespace by inclusion of <unistd.h>."
    
    So we must include it ourselves. This is based on an upstream patch
    by Hicham Haouari:
    
      
http://pkgs.fedoraproject.org/gitweb/?p=gnash.git;a=blob;f=gnash-0.8.10-add-unistd-header.patch;h=d2995180546f27a8f30162b2d4a0f8e15de9a9bb;hb=HEAD

diff --git a/plugin/klash4/Makefile.am b/plugin/klash4/Makefile.am
index 36a2196..fc43451 100644
--- a/plugin/klash4/Makefile.am
+++ b/plugin/klash4/Makefile.am
@@ -23,7 +23,9 @@ AM_CPPFLAGS = \
        $(KDE4_CFLAGS) \
        $(QT4_CFLAGS) \
        $(X11_CFLAGS) \
-       -DGNASHBINDIR=\"${bindir}\"
+       -I$(top_srcdir)/libbase \
+       -DGNASHBINDIR=\"${bindir}\" \
+       $(NULL)
 
 plugindir   = $(KDE4_PLUGINDIR)
 kde_servicesdir = $(KDE4_SERVICESDIR)
diff --git a/plugin/klash4/klash_part.cpp b/plugin/klash4/klash_part.cpp
index b027b4b..3ba0873 100644
--- a/plugin/klash4/klash_part.cpp
+++ b/plugin/klash4/klash_part.cpp
@@ -43,6 +43,7 @@
 #include "klash_part.h"
 
 #include <csignal>
+#include "GnashSystemIOHeaders.h"
 
 //-----------------------------------------------------------------------------
 

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

Summary of changes:


hooks/post-receive
-- 
Gnash