aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattip <matti.picus@gmail.com>2014-05-07 19:25:09 +0300
committermattip <matti.picus@gmail.com>2014-05-07 19:25:09 +0300
commit51dad0c43441a5cd457ea4491f25ba33e457919b (patch)
tree74fdf50d09bb621da124bc733be161ce027e3577
parentRevert partially d95d0c9bb988, because it was bogus. My fault for (diff)
downloadpypy-51dad0c43441a5cd457ea4491f25ba33e457919b.tar.gz
pypy-51dad0c43441a5cd457ea4491f25ba33e457919b.tar.bz2
pypy-51dad0c43441a5cd457ea4491f25ba33e457919b.zip
Backed out changeset: ad12f8418f24
-rw-r--r--rpython/translator/c/genc.py4
-rw-r--r--rpython/translator/c/src/asm_msvc.c1
2 files changed, 0 insertions, 5 deletions
diff --git a/rpython/translator/c/genc.py b/rpython/translator/c/genc.py
index 83016e332e..a3c2d2f4a4 100644
--- a/rpython/translator/c/genc.py
+++ b/rpython/translator/c/genc.py
@@ -751,8 +751,6 @@ def commondefs(defines):
def add_extra_files(eci):
srcdir = py.path.local(__file__).join('..', 'src')
- _MSVC = eci.platform.name == 'msvc'
-
files = [
srcdir / 'entrypoint.c', # ifdef PYPY_STANDALONE
srcdir / 'allocator.c', # ifdef PYPY_STANDALONE
@@ -769,8 +767,6 @@ def add_extra_files(eci):
]
if _CYGWIN:
files.append(srcdir / 'cygwin_wait.c')
- if _MSVC:
- files.append(srcdir / 'asm_msvc.c')
return eci.merge(ExternalCompilationInfo(separate_module_files=files))
diff --git a/rpython/translator/c/src/asm_msvc.c b/rpython/translator/c/src/asm_msvc.c
index 2b11c2195e..16cc5bce67 100644
--- a/rpython/translator/c/src/asm_msvc.c
+++ b/rpython/translator/c/src/asm_msvc.c
@@ -1,6 +1,5 @@
#ifdef PYPY_X86_CHECK_SSE2
#include <intrin.h>
-#include <stdio.h>
void pypy_x86_check_sse2(void)
{
int features;