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/Include/pyport.h b/Include/pyport.h
index 847a3320e98193bf4befc224c8ad04698708b952..d1acd8ff6a3de07a11dbd2db59082d13702c28ed 100644 (file)
--- a/Include/pyport.h
+++ b/Include/pyport.h
@@ -453,9 +453,10 @@ typedef    struct fd_set {
 /*
  * Hide GCC attributes from compilers that don't support them.
  */
-#if !defined(__GNUC__) || __GNUC__ < 2 || \
-    (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || \
-    defined(NEXT)
+#if (!defined(__GNUC__) || __GNUC__ < 2 || \
+     (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || \
+     defined(NEXT) ) && \
+    !defined(RISCOS)
 #define __attribute__(__x)
 #endif
 

diff --git a/RISCOS/Makefile b/RISCOS/Makefile
index c20588b220022eedbc84daa94d86efc721cab989..649404bcf0e14445dbf5eec85db812c2f3917a01 100644 (file)
--- 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 9d3510cc4c26a559e3a439fc9d7389497b186e01..c4410173eb6bd4c2b134744aaf706806bd105035 100644 (file)
--- 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);