Merge changes from The Witness.

2012-07-20 16:19:03 +00:00
parent fea97461c5
commit 3b4fcd0369
36 changed files with 1073 additions and 178 deletions
--- a/src/nvcore/DefsGnucDarwin.h
+++ b/src/nvcore/DefsGnucDarwin.h
@ -25,7 +25,7 @@
 #endif

 #define NV_FASTCALL		__attribute__((fastcall))
-#define NV_FORCEINLINE	inline __attribute__((always_inline))
+#define NV_FORCEINLINE	__attribute__((always_inline))
 #define NV_DEPRECATED   __attribute__((deprecated))

 #if __GNUC__ > 2