diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2010-12-03 20:14:31 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2010-12-03 20:14:31 (GMT) |
| commit | 4d0d471a8031de90a2b1ce99c4ac4780e60b3bc9 (patch) | |
| tree | c8f1fef715f8d158e58f17cab14af65455de1d77 /Include/marshal.h | |
| parent | c4df7845143f9afe0d20f4421a41904f3cbb991a (diff) | |
| download | cpython-4d0d471a8031de90a2b1ce99c4ac4780e60b3bc9.zip cpython-4d0d471a8031de90a2b1ce99c4ac4780e60b3bc9.tar.gz cpython-4d0d471a8031de90a2b1ce99c4ac4780e60b3bc9.tar.bz2 | |
Merge branches/pep-0384.
Diffstat (limited to 'Include/marshal.h')
| -rw-r--r-- | Include/marshal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Include/marshal.h b/Include/marshal.h index 411fdca..e96d062 100644 --- a/Include/marshal.h +++ b/Include/marshal.h @@ -13,10 +13,12 @@ PyAPI_FUNC(void) PyMarshal_WriteLongToFile(long, FILE *, int); PyAPI_FUNC(void) PyMarshal_WriteObjectToFile(PyObject *, FILE *, int); PyAPI_FUNC(PyObject *) PyMarshal_WriteObjectToString(PyObject *, int); +#ifndef Py_LIMITED_API PyAPI_FUNC(long) PyMarshal_ReadLongFromFile(FILE *); PyAPI_FUNC(int) PyMarshal_ReadShortFromFile(FILE *); PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromFile(FILE *); PyAPI_FUNC(PyObject *) PyMarshal_ReadLastObjectFromFile(FILE *); +#endif PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromString(char *, Py_ssize_t); #ifdef __cplusplus |