Dan Villiom Podlaski Christiansen avatar Dan Villiom Podlaski Christiansen committed b7f4b25 Merge

Merge work & home queues.

Comments (0)

Files changed (6)

+# HG changeset patch
+# Parent 392562899d0b0de77d247b88a9190ab91cb61995
+# User Dan Villiom Podlaski Christiansen <danchr@gmail.com>
+Add "bytesobject.h" header, copied from CPython 2.7.
+
+Functions not provided by PyPy are commented out.
+
+diff --git a/pypy/module/cpyext/include/Python.h b/pypy/module/cpyext/include/Python.h
+--- a/pypy/module/cpyext/include/Python.h
++++ b/pypy/module/cpyext/include/Python.h
+@@ -119,6 +119,7 @@ typedef long Py_ssize_t;
+ #include "pycobject.h"
+ #include "pycapsule.h"
+ #include "bufferobject.h"
++#include "bytesobject.h"
+ #include "sliceobject.h"
+ #include "datetime.h"
+ #include "pystate.h"
+diff --git a/pypy/module/cpyext/include/bytesobject.h b/pypy/module/cpyext/include/bytesobject.h
+new file mode 100644
+--- /dev/null
++++ b/pypy/module/cpyext/include/bytesobject.h
+@@ -0,0 +1,27 @@
++#define PyBytesObject PyStringObject
++#define PyBytes_Type PyString_Type
++
++#define PyBytes_Check PyString_Check
++#define PyBytes_CheckExact PyString_CheckExact
++//#define PyBytes_CHECK_INTERNED PyString_CHECK_INTERNED
++#define PyBytes_AS_STRING PyString_AS_STRING
++#define PyBytes_GET_SIZE PyString_GET_SIZE
++#define Py_TPFLAGS_BYTES_SUBCLASS Py_TPFLAGS_STRING_SUBCLASS
++
++#define PyBytes_FromStringAndSize PyString_FromStringAndSize
++#define PyBytes_FromString PyString_FromString
++#define PyBytes_FromFormatV PyString_FromFormatV
++#define PyBytes_FromFormat PyString_FromFormat
++#define PyBytes_Size PyString_Size
++#define PyBytes_AsString PyString_AsString
++//#define PyBytes_Repr PyString_Repr
++#define PyBytes_Concat PyString_Concat
++#define PyBytes_ConcatAndDel PyString_ConcatAndDel
++//#define _PyBytes_Resize _PyString_Resize
++//#define _PyBytes_Eq _PyString_Eq
++#define PyBytes_Format PyString_Format
++//#define _PyBytes_FormatLong _PyString_FormatLong
++//#define PyBytes_DecodeEscape PyString_DecodeEscape
++//#define _PyBytes_Join _PyString_Join
++#define PyBytes_AsStringAndSize PyString_AsStringAndSize
++//#define _PyBytes_InsertThousandsGrouping _PyString_InsertThousandsGrouping

File contents unchanged.

+# HG changeset patch
+# Parent f20d00165f8821ae5e86de36c02a44607ce513d3
+# User Dan Villiom Podlaski Christiansen  <danchr@gmail.com>
+Hack to fix translation on Darwin
+
+diff --git a/pypy/translator/platform/posix.py b/pypy/translator/platform/posix.py
+--- a/pypy/translator/platform/posix.py
++++ b/pypy/translator/platform/posix.py
+@@ -20,7 +20,9 @@ class BasePosix(Platform):
+         self.cc = cc
+ 
+     def _libs(self, libraries):
+-        return ['-l%s' % lib for lib in libraries]
++        # FIXME: using -reexport-l instead of -l is arguably incorrect, but
++        # allows RFFI to continue pointlessly reexporting imported symbols
++        return ['-reexport‐l%s' % lib for lib in libraries]
+ 
+     def _libdirs(self, library_dirs):
+         return ['-L%s' % ldir for ldir in library_dirs]
 drop-macosx-version-min.diff
+reexport.diff
+bytes.diff
 no-macports.diff
 visibility.diff
 test-kwargs.diff

File contents unchanged.

File contents unchanged.

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.