Merge pull request #1250 from undingen/pyport_fix

Remove redefinition error in pyport.h

Merge pull request #1250 from undingen/pyport_fix
Remove redefinition error in pyport.h
a5488ae7 · Marius Wachtler · GitHub · af389a7b · ca2ff3c3 · a5488ae7
Commit a5488ae7 authored Jun 13, 2016 by Marius Wachtler Committed by GitHub Jun 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 8 deletions

from_cpython/Include/pyport.h from_cpython/Include/pyport.h +1 -8

No files found.
--- a/from_cpython/Include/pyport.h
+++ b/from_cpython/Include/pyport.h
@@ -22,14 +22,7 @@
 #define PYSTON_CONST
 #endif

-#define Py_PROTO(x) x
-
-// Pyston change: these are just hard-coded for now:
-typedef ssize_t         Py_ssize_t;
-#define Py_FORMAT_PARSETUPLE(func,p1,p2)
-#define Py_GCC_ATTRIBUTE(x) __attribute__(x)
-
-// Pyston change: the rest of these have just been copied from CPython's pyport.h, in an arbitrary order:
+// Pyston change: the rest of these have just been copied from CPython's pyport.h:


 /**************************************************************************