[pypy-commit] pypy kill-someobject: merge

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: kill-someobject
Changeset: r57881:800018e02513
Date: 2012-10-08 10:19 +0200
http://bitbucket.org/pypy/pypy/changeset/800018e02513/

Log:	merge

diff --git a/pypy/translator/c/src/g_include.h b/pypy/translator/c/src/g_include.h
--- a/pypy/translator/c/src/g_include.h
+++ b/pypy/translator/c/src/g_include.h
@@ -2,19 +2,9 @@
 /************************************************************/
 /***  C header file for code produced by genc.py          ***/
 
-#ifdef PYPY_CPYTHON_EXTENSION
-#  include "Python.h"
-#  include "compile.h"
-#  include "frameobject.h"
-#  include "structmember.h"
-#  include "traceback.h"
-#  include "marshal.h"
-#  include "eval.h"
-#else
-#  include <stdlib.h>
-#  include <assert.h>
-#  include <math.h>
-#endif
+#include <stdlib.h>
+#include <assert.h>
+#include <math.h>
 
 #include "src/mem.h"
 #include "src/exception.h"
@@ -46,8 +36,8 @@
 #  include "src/ll_strtod.h"
 #endif
 
+#  include "src/allocator.h"
 #ifdef PYPY_STANDALONE
-#  include "src/allocator.h"
 #  include "src/main.h"
 #endif
 
diff --git a/pypy/translator/c/src/g_prerequisite.h b/pypy/translator/c/src/g_prerequisite.h
--- a/pypy/translator/c/src/g_prerequisite.h
+++ b/pypy/translator/c/src/g_prerequisite.h
@@ -3,9 +3,7 @@
 /***  this is included before any code produced by genc.py  ***/
 
 
-#ifdef PYPY_STANDALONE
-#  include "src/commondefs.h"
-#endif
+#include "src/commondefs.h"
 
 #ifdef _WIN32
 #  include <io.h>   /* needed, otherwise _lseeki64 truncates to 32-bits (??) */