kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge fix

Browse Source
This commit is contained in:
Joshua Granick
2014-04-10 18:30:02 -07:00
parent 453e896cc3
commit 1649dce8af
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
project/src/ExternalInterface.cpp
View File

@@ -552,7 +552,6 @@ namespace nme {
} }
<<<<<<< HEAD
extern "C" int nme_register_prims(); extern "C" int nme_register_prims();
extern "C" int lime_register_prims() extern "C" int lime_register_prims()
@@ -560,16 +559,3 @@ extern "C" int lime_register_prims()
nme_register_prims(); nme_register_prims();
return 0; return 0;
} }
=======
#ifdef STATIC_LINK
extern "C" int nme_register_prims();
extern "C" int lime_register_prims()
{
nme_register_prims();
return 0;
}
#endif //STATIC_LINK
>>>>>>> 0b3e4ad2a15f7336d45d67f0ffba6eae6fd52b8e