Pārlūkot izejas kodu

Refactoring C externs a bit in BSL importer

BearishSun 10 gadi atpakaļ
vecāks
revīzija
d21edc5a0a

+ 1 - 1
BansheeSL/BansheeSL.vcxproj

@@ -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" />

+ 1 - 1
BansheeSL/BansheeSL.vcxproj.filters

@@ -62,7 +62,7 @@
     <ClCompile Include="Source\BsIncludeHandler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Source\BSMMAlloc.cpp">
+    <ClCompile Include="Source\BSMMAlloc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>

+ 2 - 10
BansheeSL/Include/BsIncludeHandler.h

@@ -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);
-
-#ifdef __cplusplus
-}
-#endif
+char* includePush(ParseState* state, const char* filename, int line, int column, int* size);
+void includePop(ParseState* state);
 
 #endif

+ 0 - 8
BansheeSL/Include/BsMMAlloc.h

@@ -3,18 +3,10 @@
 #ifndef __MMALLOC_H__
 #define __MMALLOC_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 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);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

+ 0 - 0
BansheeSL/Source/BSMMAlloc.cpp → BansheeSL/Source/BSMMAlloc.c


+ 4 - 1
BansheeSL/Source/BsIncludeHandler.cpp

@@ -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;