[Scummvm-cvs-logs] SF.net SVN: scummvm:[44033] scummvm/trunk/common/scummsys.h

nolange at users.sourceforge.net nolange at users.sourceforge.net
Fri Sep 11 14:58:15 CEST 2009


Revision: 44033
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44033&view=rev
Author:   nolange
Date:     2009-09-11 12:58:08 +0000 (Fri, 11 Sep 2009)

Log Message:
-----------
fix duplicate definition of FORCEINLINE on mingw toolchains

Modified Paths:
--------------
    scummvm/trunk/common/scummsys.h

Modified: scummvm/trunk/common/scummsys.h
===================================================================
--- scummvm/trunk/common/scummsys.h	2009-09-11 11:36:16 UTC (rev 44032)
+++ scummvm/trunk/common/scummsys.h	2009-09-11 12:58:08 UTC (rev 44033)
@@ -383,7 +383,7 @@
 	#define PACKED_STRUCT __attribute__((__packed__))
 	#define GCC_PRINTF(x,y) __attribute__((__format__(printf, x, y)))
 
-	#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
+	#if !defined(FORCEINLINE) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
 		#define FORCEINLINE __attribute__((__always_inline__)) inline
 	#endif
 #else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list