diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-10-09 07:27:06 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-10-09 07:27:06 -0700 |
| commit | 8c35202927a7cd8f14b219e4949195e1e6bc6946 (patch) | |
| tree | 2cc79d36f916c220b3bc449cba4d3ab602f534c4 /src/include/emscripten.h | |
| parent | efaf3590ac33702eeff423e31e85f690b1fc7eb2 (diff) | |
| parent | 06354eda6092add55034c692bd65734a61083e8b (diff) | |
Merge branch 'llvm-svn'
Conflicts:
src/dlmalloc.c
tests/dlmalloc.c
tests/runner.py
tools/shared.py
Diffstat (limited to 'src/include/emscripten.h')
| -rw-r--r-- | src/include/emscripten.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/include/emscripten.h b/src/include/emscripten.h deleted file mode 100644 index b06f3781..00000000 --- a/src/include/emscripten.h +++ /dev/null @@ -1,16 +0,0 @@ -/** - * This file contains a few useful things for compiling C/C++ code - * with Emscripten, an LLVM-to-JavaScript compiler. - * - * The code can be used permissively under the MIT license. - * - * http://emscripten.org - */ - -#undef __i386__ -#undef __x86_64__ - -// Interface to the underlying JS engine. This function will -// eval() the given script. -extern void emscripten_run_script(const char *script); - |