summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Include/pyport.h7
-rw-r--r--RISCOS/Makefile11
-rw-r--r--RISCOS/Modules/riscosmodule.c5
3 files changed, 14 insertions, 9 deletions
diff --git a/Include/pyport.h b/Include/pyport.h
index 847a332..d1acd8f 100644
--- 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 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);