diff options
| author | Guido van Rossum <guido@python.org> | 2007-05-03 17:49:24 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-05-03 17:49:24 (GMT) |
| commit | 8d30cc0144a6a94e06f3a115b07afa6314466cfd (patch) | |
| tree | 0c0b2f3d75cca4173ec3e8e2962682affbd2e886 /Include | |
| parent | 938ef57e267838dcfbfb0d51d9bd40caece1c5db (diff) | |
| download | cpython-8d30cc0144a6a94e06f3a115b07afa6314466cfd.zip cpython-8d30cc0144a6a94e06f3a115b07afa6314466cfd.tar.gz cpython-8d30cc0144a6a94e06f3a115b07afa6314466cfd.tar.bz2 | |
Get rid of all #ifdef Py_USING_UNICODE (it is always present now).
(With the help of unifdef from freshmeat.)
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/longobject.h | 2 | ||||
| -rw-r--r-- | Include/object.h | 2 | ||||
| -rw-r--r-- | Include/pyerrors.h | 4 | ||||
| -rw-r--r-- | Include/unicodeobject.h | 8 |
4 files changed, 0 insertions, 16 deletions
diff --git a/Include/longobject.h b/Include/longobject.h index 9e87604..9ec1902 100644 --- a/Include/longobject.h +++ b/Include/longobject.h @@ -51,9 +51,7 @@ PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLongMask(PyObject *); #endif /* HAVE_LONG_LONG */ PyAPI_FUNC(PyObject *) PyLong_FromString(char *, char **, int); -#ifdef Py_USING_UNICODE PyAPI_FUNC(PyObject *) PyLong_FromUnicode(Py_UNICODE*, Py_ssize_t, int); -#endif /* _PyLong_Sign. Return 0 if v is 0, -1 if v < 0, +1 if v > 0. v must not be NULL, and must be a normalized long. diff --git a/Include/object.h b/Include/object.h index 40e52e3..f50ffe6 100644 --- a/Include/object.h +++ b/Include/object.h @@ -374,9 +374,7 @@ PyAPI_FUNC(void) _PyObject_Dump(PyObject *); PyAPI_FUNC(PyObject *) PyObject_Repr(PyObject *); PyAPI_FUNC(PyObject *) _PyObject_Str(PyObject *); PyAPI_FUNC(PyObject *) PyObject_Str(PyObject *); -#ifdef Py_USING_UNICODE PyAPI_FUNC(PyObject *) PyObject_Unicode(PyObject *); -#endif PyAPI_FUNC(int) PyObject_Compare(PyObject *, PyObject *); PyAPI_FUNC(PyObject *) PyObject_RichCompare(PyObject *, PyObject *, int); PyAPI_FUNC(int) PyObject_RichCompareBool(PyObject *, PyObject *, int); diff --git a/Include/pyerrors.h b/Include/pyerrors.h index 562af10..5573b73 100644 --- a/Include/pyerrors.h +++ b/Include/pyerrors.h @@ -26,7 +26,6 @@ typedef struct { PyObject *print_file_and_line; } PySyntaxErrorObject; -#ifdef Py_USING_UNICODE typedef struct { PyObject_HEAD PyObject *dict; @@ -38,7 +37,6 @@ typedef struct { PyObject *end; PyObject *reason; } PyUnicodeErrorObject; -#endif typedef struct { PyObject_HEAD @@ -235,7 +233,6 @@ PyAPI_FUNC(void) PyErr_SetInterrupt(void); PyAPI_FUNC(void) PyErr_SyntaxLocation(const char *, int); PyAPI_FUNC(PyObject *) PyErr_ProgramText(const char *, int); -#ifdef Py_USING_UNICODE /* The following functions are used to create and modify unicode exceptions from C */ @@ -297,7 +294,6 @@ PyAPI_FUNC(int) PyUnicodeDecodeError_SetReason( PyObject *, const char *); PyAPI_FUNC(int) PyUnicodeTranslateError_SetReason( PyObject *, const char *); -#endif /* These APIs aren't really part of the error implementation, but diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index 0bad8c3..c12cb96 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -58,13 +58,6 @@ Copyright (c) Corporation for National Research Initiatives. /* --- Internal Unicode Format -------------------------------------------- */ -#ifndef Py_USING_UNICODE - -#define PyUnicode_Check(op) 0 -#define PyUnicode_CheckExact(op) 0 - -#else - /* FIXME: MvL's new implementation assumes that Py_UNICODE_SIZE is properly set, but the default rules below doesn't set it. I'll sort this out some other day -- fredrik@pythonware.com */ @@ -1262,5 +1255,4 @@ PyAPI_FUNC(int) _PyUnicode_IsAlpha( #ifdef __cplusplus } #endif -#endif /* Py_USING_UNICODE */ #endif /* !Py_UNICODEOBJECT_H */ |