From 0073f2e42865766d1de6472b49a9181cef49a4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Thu, 21 Nov 2002 23:52:35 +0000 Subject: [PATCH] Fix --disable-unicode compilation problems. --- Modules/posixmodule.c | 5 +++++ Objects/fileobject.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 04a0611de91..fd7f69f6b1f 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -22,6 +22,11 @@ standardized by the C Standard and the POSIX standard (a thinly\n\ disguised Unix interface). Refer to the library manual and\n\ corresponding Unix manual entries for more information on calls."); +#ifndef Py_USING_UNICODE +/* This is used in signatures of functions. */ +#define Py_UNICODE void +#endif + #if defined(PYOS_OS2) #define INCL_DOS #define INCL_DOSERRORS diff --git a/Objects/fileobject.c b/Objects/fileobject.c index ebf0d40d420..b6c88dbf229 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -116,9 +116,11 @@ fill_file_fields(PyFileObject *f, FILE *fp, char *name, char *mode, Py_DECREF(f->f_name); Py_DECREF(f->f_mode); +#ifdef Py_USING_UNICODE if (wname) f->f_name = PyUnicode_FromObject(wname); else +#endif f->f_name = PyString_FromString(name); f->f_mode = PyString_FromString(mode); @@ -329,6 +331,7 @@ static PyObject * file_repr(PyFileObject *f) { if (PyUnicode_Check(f->f_name)) { +#ifdef Py_USING_UNICODE PyObject *ret = NULL; PyObject *name; name = PyUnicode_AsUnicodeEscapeString(f->f_name); @@ -339,6 +342,7 @@ file_repr(PyFileObject *f) f); Py_XDECREF(name); return ret; +#endif } else { return PyString_FromFormat("<%s file '%s', mode '%s' at %p>", f->f_fp == NULL ? "closed" : "open",