diff options
Diffstat (limited to 'Include/stringobject.h')
| -rw-r--r-- | Include/stringobject.h | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/Include/stringobject.h b/Include/stringobject.h index 2a56ef6..abc8fad 100644 --- a/Include/stringobject.h +++ b/Include/stringobject.h @@ -39,31 +39,31 @@ typedef struct { char ob_sval[1]; } PyStringObject; -extern DL_IMPORT(PyTypeObject) PyBaseString_Type; -extern DL_IMPORT(PyTypeObject) PyString_Type; +PyAPI_DATA(PyTypeObject) PyBaseString_Type; +PyAPI_DATA(PyTypeObject) PyString_Type; #define PyString_Check(op) PyObject_TypeCheck(op, &PyString_Type) #define PyString_CheckExact(op) ((op)->ob_type == &PyString_Type) -extern DL_IMPORT(PyObject *) PyString_FromStringAndSize(const char *, int); -extern DL_IMPORT(PyObject *) PyString_FromString(const char *); -extern DL_IMPORT(PyObject *) PyString_FromFormatV(const char*, va_list) +PyAPI_FUNC(PyObject *) PyString_FromStringAndSize(const char *, int); +PyAPI_FUNC(PyObject *) PyString_FromString(const char *); +PyAPI_FUNC(PyObject *) PyString_FromFormatV(const char*, va_list) __attribute__((format(printf, 1, 0))); -extern DL_IMPORT(PyObject *) PyString_FromFormat(const char*, ...) +PyAPI_FUNC(PyObject *) PyString_FromFormat(const char*, ...) __attribute__((format(printf, 1, 2))); -extern DL_IMPORT(int) PyString_Size(PyObject *); -extern DL_IMPORT(char *) PyString_AsString(PyObject *); -extern DL_IMPORT(void) PyString_Concat(PyObject **, PyObject *); -extern DL_IMPORT(void) PyString_ConcatAndDel(PyObject **, PyObject *); -extern DL_IMPORT(int) _PyString_Resize(PyObject **, int); -extern DL_IMPORT(int) _PyString_Eq(PyObject *, PyObject*); -extern DL_IMPORT(PyObject *) PyString_Format(PyObject *, PyObject *); -extern DL_IMPORT(PyObject *) _PyString_FormatLong(PyObject*, int, int, +PyAPI_FUNC(int) PyString_Size(PyObject *); +PyAPI_FUNC(char *) PyString_AsString(PyObject *); +PyAPI_FUNC(void) PyString_Concat(PyObject **, PyObject *); +PyAPI_FUNC(void) PyString_ConcatAndDel(PyObject **, PyObject *); +PyAPI_FUNC(int) _PyString_Resize(PyObject **, int); +PyAPI_FUNC(int) _PyString_Eq(PyObject *, PyObject*); +PyAPI_FUNC(PyObject *) PyString_Format(PyObject *, PyObject *); +PyAPI_FUNC(PyObject *) _PyString_FormatLong(PyObject*, int, int, int, char**, int*); -extern DL_IMPORT(void) PyString_InternInPlace(PyObject **); -extern DL_IMPORT(PyObject *) PyString_InternFromString(const char *); -extern DL_IMPORT(void) _Py_ReleaseInternedStrings(void); +PyAPI_FUNC(void) PyString_InternInPlace(PyObject **); +PyAPI_FUNC(PyObject *) PyString_InternFromString(const char *); +PyAPI_FUNC(void) _Py_ReleaseInternedStrings(void); /* Macro, trading safety for speed */ #define PyString_AS_STRING(op) (((PyStringObject *)(op))->ob_sval) @@ -71,14 +71,14 @@ extern DL_IMPORT(void) _Py_ReleaseInternedStrings(void); /* _PyString_Join(sep, x) is like sep.join(x). sep must be PyStringObject*, x must be an iterable object. */ -extern DL_IMPORT(PyObject *) _PyString_Join(PyObject *sep, PyObject *x); +PyAPI_FUNC(PyObject *) _PyString_Join(PyObject *sep, PyObject *x); /* --- Generic Codecs ----------------------------------------------------- */ /* Create an object by decoding the encoded string s of the given size. */ -extern DL_IMPORT(PyObject*) PyString_Decode( +PyAPI_FUNC(PyObject*) PyString_Decode( const char *s, /* encoded string */ int size, /* size of buffer */ const char *encoding, /* encoding */ @@ -88,7 +88,7 @@ extern DL_IMPORT(PyObject*) PyString_Decode( /* Encodes a char buffer of the given size and returns a Python object. */ -extern DL_IMPORT(PyObject*) PyString_Encode( +PyAPI_FUNC(PyObject*) PyString_Encode( const char *s, /* string char buffer */ int size, /* number of chars to encode */ const char *encoding, /* encoding */ @@ -98,7 +98,7 @@ extern DL_IMPORT(PyObject*) PyString_Encode( /* Encodes a string object and returns the result as Python object. */ -extern DL_IMPORT(PyObject*) PyString_AsEncodedObject( +PyAPI_FUNC(PyObject*) PyString_AsEncodedObject( PyObject *str, /* string object */ const char *encoding, /* encoding */ const char *errors /* error handling */ @@ -112,7 +112,7 @@ extern DL_IMPORT(PyObject*) PyString_AsEncodedObject( DEPRECATED - use PyString_AsEncodedObject() instead. */ -extern DL_IMPORT(PyObject*) PyString_AsEncodedString( +PyAPI_FUNC(PyObject*) PyString_AsEncodedString( PyObject *str, /* string object */ const char *encoding, /* encoding */ const char *errors /* error handling */ @@ -121,7 +121,7 @@ extern DL_IMPORT(PyObject*) PyString_AsEncodedString( /* Decodes a string object and returns the result as Python object. */ -extern DL_IMPORT(PyObject*) PyString_AsDecodedObject( +PyAPI_FUNC(PyObject*) PyString_AsDecodedObject( PyObject *str, /* string object */ const char *encoding, /* encoding */ const char *errors /* error handling */ @@ -135,7 +135,7 @@ extern DL_IMPORT(PyObject*) PyString_AsDecodedObject( DEPRECATED - use PyString_AsDecodedObject() instead. */ -extern DL_IMPORT(PyObject*) PyString_AsDecodedString( +PyAPI_FUNC(PyObject*) PyString_AsDecodedString( PyObject *str, /* string object */ const char *encoding, /* encoding */ const char *errors /* error handling */ @@ -147,7 +147,7 @@ extern DL_IMPORT(PyObject*) PyString_AsDecodedString( 0-terminated (passing a string with embedded NULL characters will cause an exception). */ -extern DL_IMPORT(int) PyString_AsStringAndSize( +PyAPI_FUNC(int) PyString_AsStringAndSize( register PyObject *obj, /* string or Unicode object */ register char **s, /* pointer to buffer variable */ register int *len /* pointer to length variable or NULL |