[Spice-devel] [PATCH spice-gtk] Fix _FORTIFY_SOURCE redefine error

[Christophe Fergeau]

On Sun, Sep 08, 2013 at 04:55:25PM +0300, Uri Lublin wrote:
> On 09/06/2013 10:59 PM, Dunrong Huang wrote:
> >If the _FORTIFY_SOURCE has been already defined, we shouldn't redefine
> >it, or it will raise a build error as below:
> >
> >In file included from spice-audio.c:36:0:
> >../config.h:12:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
> >spice-audio.c:1:0: note: this is the location of the previous definition
> >
> >Suggested-by: Christophe Fergeau <cfergeau at redhat.com>
> >Signed-off-by: Dunrong Huang <riegamaths at gmail.com>
> >---
> >  m4/spice-compile-warnings.m4 | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> >diff --git a/m4/spice-compile-warnings.m4 b/m4/spice-compile-warnings.m4
> >index 31fc0fc..533bac6 100644
> >--- a/m4/spice-compile-warnings.m4
> >+++ b/m4/spice-compile-warnings.m4
> >@@ -104,7 +104,7 @@ AC_DEFUN([SPICE_COMPILE_WARNINGS],[
> >      # Use improved glibc headers
> >      AH_VERBATIM([FORTIFY_SOURCE],
> >      [/* Enable compile-time and run-time bounds-checking, and some warnings. */
> >-     #if defined __OPTIMIZE__ && __OPTIMIZE__
> >+     #if !defined _FORTIFY_SOURCE &&  defined __OPTIMIZE__ && __OPTIMIZE__
> >       # define _FORTIFY_SOURCE 2
> >       #endif
> >      ])
> 
> Ack.

Pushed that one as well

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20130910/b9145338/attachment.pgp>