diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-12-07 10:37:25 -0500 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-12-07 10:37:25 -0500 |
| commit | 1a007b1631509b9d72499a8f4402294017ee04dc (patch) | |
| tree | 92f8b0341497c7bd4e53aa82c690346536a244c3 /src/relooper/Relooper.cpp | |
| parent | df11c6f1fd1636a355b83a1c48b3a890596e6a32 (diff) | |
| parent | eb083723747a90cb6ab9853fec8d6e8ef54748bc (diff) | |
Merge branch 'incoming'
Diffstat (limited to 'src/relooper/Relooper.cpp')
| -rw-r--r-- | src/relooper/Relooper.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/relooper/Relooper.cpp b/src/relooper/Relooper.cpp index 0b4284bc..d2a48f63 100644 --- a/src/relooper/Relooper.cpp +++ b/src/relooper/Relooper.cpp @@ -6,7 +6,12 @@ #include <list> #include <stack> +#if EMSCRIPTEN #include "ministring.h" +#else +#include <string> +typedef std::string ministring; +#endif template <class T, class U> bool contains(const T& container, const U& contained) { return container.find(contained) != container.end(); @@ -66,11 +71,7 @@ static int AsmJS = 0; // Indenter -#if EMSCRIPTEN int Indenter::CurrIndent = 1; -#else -int Indenter::CurrIndent = 0; -#endif // Branch |