Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Guido van Rossum 2001-10-27 21:16:16 +00:00
parent 3abca127fe
commit bd67d6f32c
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Include/pyport.h
View File

@ -453,9 +453,10 @@ typedef struct fd_set {
/* /*
* Hide GCC attributes from compilers that don't support them. * Hide GCC attributes from compilers that don't support them.
*/ */
#if !defined(__GNUC__) || __GNUC__ < 2 || \ #if (!defined(__GNUC__) || __GNUC__ < 2 || \
(__GNUC__ == 2 && __GNUC_MINOR__ < 7) || \ (__GNUC__ == 2 && __GNUC_MINOR__ < 7) || \
defined(NEXT) defined(NEXT) ) && \
!defined(RISCOS)
#define __attribute__(__x) #define __attribute__(__x)
#endif #endif

11
RISCOS/Makefile
View File

@ -9,12 +9,12 @@ DLKLIB = $(LIBSROOT).dlk
ZLIB = $(LIBSROOT).zlib ZLIB = $(LIBSROOT).zlib
EXPAT = $(LIBSROOT).expat.lib EXPAT = $(LIBSROOT).expat.lib
OBJSCAN = $(DLKLIB).objscan OBJSCAN = objscan
MAKEDLK = $(DLKLIB).makedlk MAKEDLK = makedlk
# change from time to time (don't forget to change !Boot also) # change from time to time (don't forget to change !Boot also)
TARGET=Python22 TARGET=Python22
BUILD=23 BUILD=25
# #
@ -164,7 +164,9 @@ OBJECTS_OBJECTS =\
@.^.Objects.o.abstract\ @.^.Objects.o.abstract\
@.^.Objects.o.unicodectype\ @.^.Objects.o.unicodectype\
@.^.Objects.o.unicodeobject\ @.^.Objects.o.unicodeobject\
@.^.Objects.o.descrobject @.^.Objects.o.descrobject\
@.^.Objects.o.weakrefobject\
@.^.Objects.o.structseq
OBJECTS_PARSER =\ OBJECTS_PARSER =\
@ -418,6 +420,7 @@ rebuild: clean clean-support
-wipe @.^.Lib.*/pyd ~C ~V -wipe @.^.Lib.*/pyd ~C ~V
-wipe @.^.Lib.plat-riscos.*/pyd ~C~V -wipe @.^.Lib.plat-riscos.*/pyd ~C~V
remove s.linktab remove s.linktab
remove @.^.LibPython
clean-support: clean-support:
-wipe @.^.!* ~C~V -wipe @.^.!* ~C~V

5
RISCOS/Modules/riscosmodule.c
View File

@ -7,6 +7,7 @@
#include "unixstuff.h" #include "unixstuff.h"
#include "Python.h" #include "Python.h"
#include "structseq.h"
#include <errno.h> #include <errno.h>
@ -142,7 +143,7 @@ static PyStructSequence_Field stat_result_fields[] = {
{ "st_ctime", "time of last change" }, { "st_ctime", "time of last change" },
{ "st_ftype", "file type" }, { "st_ftype", "file type" },
{ "st_attrs", "attributes" }, { "st_attrs", "attributes" },
{ "st_obtype", "object type" } { "st_obtype", "object type" },
{ 0 } { 0 }
}; };
@ -194,7 +195,7 @@ static PyObject *riscos_stat(PyObject *self,PyObject *args)
PyStructSequence_SET_ITEM(v, 11, PyStructSequence_SET_ITEM(v, 11,
PyInt_FromLong((long) at)); /*attributes*/ PyInt_FromLong((long) at)); /*attributes*/
PyStructSequence_SET_ITEM(v, 12, PyStructSequence_SET_ITEM(v, 12,
PyInt_FromLong((long) ot)); /*object type*/ PyInt_FromLong((long) ob)); /*object type*/
if (PyErr_Occurred()) { if (PyErr_Occurred()) {
Py_DECREF(v); Py_DECREF(v);