[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61323] trunk/lib/win64_vc12/jack/include/ jack/systemdeps.h: VS2013 Libs update:

Juergen Herrmann shadowrom at me.com
Sun Mar 9 00:24:37 CET 2014


Revision: 61323
          https://developer.blender.org/rBL61323
Author:   shadowrom
Date:     2014-03-08 23:24:36 +0000 (Sat, 08 Mar 2014)
Log Message:
-----------
VS2013 Libs update: 
Silence annoying __inline__ redefinition warning in VS2013.

Modified Paths:
--------------
    trunk/lib/win64_vc12/jack/include/jack/systemdeps.h

Modified: trunk/lib/win64_vc12/jack/include/jack/systemdeps.h
===================================================================
--- trunk/lib/win64_vc12/jack/include/jack/systemdeps.h	2014-03-06 15:19:46 UTC (rev 61322)
+++ trunk/lib/win64_vc12/jack/include/jack/systemdeps.h	2014-03-08 23:24:36 UTC (rev 61323)
@@ -65,7 +65,9 @@
     #ifdef _MSC_VER     /* Microsoft compiler */
 		#if _MSC_VER >= 1700
 			#include <stdint.h>
-			#define __inline__ inline
+			#ifndef __inline__
+			#	define __inline__ inline
+			#endif
 		#else
 			#define __inline__ inline
 			#if (!defined(int8_t) && !defined(_STDINT_H))




More information about the Bf-blender-cvs mailing list