openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ensure consistent enablement of gcc 'diagnostic' pragma 

The virt-compile-warnings.m4 file would do an explicit
check for whether the compile could use the 'diagnostic'
pragma push/pop feature. The src/internal.h file would
then only enable it for GCC >= 4.6

This breaks with clang which supports the pragma but
does not claim GCC 4.6 compat. Export a variable from
the m4 check to the header file so they are consistent.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-05-13 12:41:07 +01:00
parent 5fd6ae3f2e
commit c43b685a1d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
m4/virt-compile-warnings.m4
View File

@ -94,6 +94,9 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
dontwarn="$dontwarn -Wmissing-prototypes" dontwarn="$dontwarn -Wmissing-prototypes"
dontwarn="$dontwarn -Wmissing-declarations" dontwarn="$dontwarn -Wmissing-declarations"
dontwarn="$dontwarn -Wcast-align" dontwarn="$dontwarn -Wcast-align"
else
AC_DEFINE_UNQUOTED([WORKING_PRAGMA_PUSH], 1,
[Define to 1 if gcc supports pragma push/pop])
fi fi
dnl Check whether strchr(s, char variable) causes a bogus compile dnl Check whether strchr(s, char variable) causes a bogus compile

2
src/internal.h
View File

@ -215,7 +215,7 @@
# endif /* __GNUC__ */ # endif /* __GNUC__ */
# if __GNUC_PREREQ (4, 6) # if WORKING_PRAGMA_PUSH
# define VIR_WARNINGS_NO_CAST_ALIGN \ # define VIR_WARNINGS_NO_CAST_ALIGN \
_Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic push") \
_Pragma ("GCC diagnostic ignored \"-Wcast-align\"") _Pragma ("GCC diagnostic ignored \"-Wcast-align\"")