[vlc-devel] commit: Win32: be compatible with GCC version bigger than 4.x ( Jean-Baptiste Kempf )

git version control git at videolan.org
Sat Jan 9 16:06:34 CET 2010


vlc-1.0-bugfix | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Jan  9 13:57:17 2010 +0100| [945231f4b4d884b55b83ec8996992abb2f328e15] | committer: Jean-Baptiste Kempf 

Win32: be compatible with GCC version bigger than 4.x
(cherry picked from commit e68c09ae281ec4f58354a56183c43867654d96fd)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc-1.0-bugfix.git/?a=commit;h=945231f4b4d884b55b83ec8996992abb2f328e15
---

 include/vlc_common.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 2f1a6db..6f4677b 100644
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -74,7 +74,7 @@
 
 /* Format string sanity checks */
 #ifdef __GNUC__
-#   if defined( _WIN32 ) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 4
+#   if defined( _WIN32 ) && (__GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 4 ) )
 #     define LIBVLC_FORMAT(x,y) __attribute__ ((format(gnu_printf,x,y)))
 #   else
 #     define LIBVLC_FORMAT(x,y) __attribute__ ((format(printf,x,y)))




More information about the vlc-devel mailing list