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
diff --git a/RISCOS/Makefile b/RISCOS/Makefile
index c20588b..649404b 100644
--- a/RISCOS/Makefile
+++ b/RISCOS/Makefile
@@ -9,12 +9,12 @@
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.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 @@
-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 @@
{ "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 @@
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);