diff options
| author | Guido van Rossum <guido@python.org> | 2001-10-27 21:16:16 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2001-10-27 21:16:16 (GMT) |
| commit | bd67d6f32c813eb3c17a07d305db7004c2dcee0a (patch) | |
| tree | cd4953633bd92555715f9f67101110fe1345450c /RISCOS | |
| parent | 3abca127fe1565ec80f6b0a1ae48d65186ad887d (diff) | |
| download | cpython-bd67d6f32c813eb3c17a07d305db7004c2dcee0a.zip cpython-bd67d6f32c813eb3c17a07d305db7004c2dcee0a.tar.gz cpython-bd67d6f32c813eb3c17a07d305db7004c2dcee0a.tar.bz2 | |
SF patch #475657 (Dietmar Schwertberger)
RISCOS/Makefile:
include structseq and weakrefobject;
changes to keep command line length below 2048
RISCOS/Modules/riscosmodule.c:
typos from the stat structseq patch
Include/pyport.h:
don't re-#define __attribute__(__x) on RISC OS as it is already defined in c library
Diffstat (limited to 'RISCOS')
| -rw-r--r-- | RISCOS/Makefile | 11 | ||||
| -rw-r--r-- | RISCOS/Modules/riscosmodule.c | 5 |
2 files changed, 10 insertions, 6 deletions
diff --git a/RISCOS/Makefile b/RISCOS/Makefile index c20588b..649404b 100644 --- a/RISCOS/Makefile +++ b/RISCOS/Makefile @@ -9,12 +9,12 @@ DLKLIB = $(LIBSROOT).dlk ZLIB = $(LIBSROOT).zlib EXPAT = $(LIBSROOT).expat.lib -OBJSCAN = $(DLKLIB).objscan -MAKEDLK = $(DLKLIB).makedlk +OBJSCAN = objscan +MAKEDLK = makedlk # change from time to time (don't forget to change !Boot also) TARGET=Python22 -BUILD=23 +BUILD=25 # @@ -164,7 +164,9 @@ OBJECTS_OBJECTS =\ @.^.Objects.o.abstract\ @.^.Objects.o.unicodectype\ @.^.Objects.o.unicodeobject\ - @.^.Objects.o.descrobject + @.^.Objects.o.descrobject\ + @.^.Objects.o.weakrefobject\ + @.^.Objects.o.structseq OBJECTS_PARSER =\ @@ -418,6 +420,7 @@ rebuild: clean clean-support -wipe @.^.Lib.*/pyd ~C ~V -wipe @.^.Lib.plat-riscos.*/pyd ~C~V remove s.linktab + remove @.^.LibPython clean-support: -wipe @.^.!* ~C~V diff --git a/RISCOS/Modules/riscosmodule.c b/RISCOS/Modules/riscosmodule.c index 9d3510c..c441017 100644 --- a/RISCOS/Modules/riscosmodule.c +++ b/RISCOS/Modules/riscosmodule.c @@ -7,6 +7,7 @@ #include "unixstuff.h" #include "Python.h" +#include "structseq.h" #include <errno.h> @@ -142,7 +143,7 @@ static PyStructSequence_Field stat_result_fields[] = { { "st_ctime", "time of last change" }, { "st_ftype", "file type" }, { "st_attrs", "attributes" }, - { "st_obtype", "object type" } + { "st_obtype", "object type" }, { 0 } }; @@ -194,7 +195,7 @@ static PyObject *riscos_stat(PyObject *self,PyObject *args) PyStructSequence_SET_ITEM(v, 11, PyInt_FromLong((long) at)); /*attributes*/ PyStructSequence_SET_ITEM(v, 12, - PyInt_FromLong((long) ot)); /*object type*/ + PyInt_FromLong((long) ob)); /*object type*/ if (PyErr_Occurred()) { Py_DECREF(v); |