@@ -303,7 +303,7 @@
</ClCompile>
<ClCompile Include="Source\BsASTFX.c" />
<ClCompile Include="Source\BsIncludeHandler.cpp" />
- <ClCompile Include="Source\BSMMAlloc.cpp" />
+ <ClCompile Include="Source\BSMMAlloc.c" />
<ClCompile Include="Source\BsSLFXCompiler.cpp" />
<ClCompile Include="Source\BsSLImporter.cpp" />
<ClCompile Include="Source\BsSLPlugin.cpp" />
@@ -62,7 +62,7 @@
<ClCompile Include="Source\BsIncludeHandler.cpp">
<Filter>Source Files</Filter>
- <ClCompile Include="Source\BSMMAlloc.cpp">
+ <ClCompile Include="Source\BSMMAlloc.c">
</ItemGroup>
@@ -5,15 +5,7 @@
#include "BsASTFX.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
- char* includePush(ParseState* state, const char* filename, int line, int column, int* size);
- void includePop(ParseState* state);
-}
+char* includePush(ParseState* state, const char* filename, int line, int column, int* size);
+void includePop(ParseState* state);
#endif
@@ -3,18 +3,10 @@
#ifndef __MMALLOC_H__
#define __MMALLOC_H__
void* mmalloc_new_context();
void mmalloc_free_context(void* context);
void* mmalloc(void* context, int size);
void mmfree(void* ptr);
char* mmalloc_strdup(void* context, const char* input);
@@ -1,8 +1,11 @@
-#include "BsIncludeHandler.h"
#include "BsSLPrerequisites.h"
#include "BsShaderManager.h"
#include "BsShaderInclude.h"
+
+extern "C" {
+#include "BsIncludeHandler.h"
#include "BsMMAlloc.h"
+}
using namespace BansheeEngine;