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