From 98c93a7330d86709dc2afe29cc852d2961e2633f Mon Sep 17 00:00:00 2001 From: "Erwin Coumans (Google)" Date: Thu, 27 Aug 2015 18:13:54 -0700 Subject: [PATCH] fix inline, __inline for _WIN32 --- examples/SharedMemory/SharedMemoryBlock.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/examples/SharedMemory/SharedMemoryBlock.h b/examples/SharedMemory/SharedMemoryBlock.h index b3d2709d0..ba7faccb5 100644 --- a/examples/SharedMemory/SharedMemoryBlock.h +++ b/examples/SharedMemory/SharedMemoryBlock.h @@ -30,7 +30,13 @@ struct SharedMemoryBlock }; -inline void InitSharedMemoryBlock(struct SharedMemoryBlock* sharedMemoryBlock) +//http://stackoverflow.com/questions/24736304/unable-to-use-inline-in-declaration-get-error-c2054 +#ifdef _WIN32 +__inline +#else +inline +#endif +void InitSharedMemoryBlock(struct SharedMemoryBlock* sharedMemoryBlock) { sharedMemoryBlock->m_numClientCommands = 0; sharedMemoryBlock->m_numServerCommands = 0;