diff --git a/RISCOS/Makefile b/RISCOS/Makefile
index e970d13..c20588b 100644
--- a/RISCOS/Makefile
+++ b/RISCOS/Makefile
@@ -4,7 +4,7 @@
 # You may need to change some of the following
 OSLIB = $(LIBSROOT).OSLib
 CLIB = $(LIBSROOT).clib
-SOCKLIB = $(LIBSROOT).netlib
+TCPIPLIB = $(LIBSROOT).TCPIPLibs
 DLKLIB = $(LIBSROOT).dlk
 ZLIB = $(LIBSROOT).zlib
 EXPAT = $(LIBSROOT).expat.lib
@@ -13,41 +13,47 @@
 MAKEDLK = $(DLKLIB).makedlk
 
 # change from time to time (don't forget to change !Boot also)
-TARGET=Python21
-BUILD=12
+TARGET=Python22
+BUILD=23
 
 
 #
 # You shouldn't need to change anything below this line
 #
-OSLIBS = OSLib:Computer,OSLib:Core,OSLib:User
-
 DLKFLAG= -DDLK
 DLKOBJS = $(DLKLIB).o.dlk_load @.o.linktab
 
-HEADERS = @,@.^.Include,@.^.Modules,@.^.Objects,@.^.Python,$(CLIB),$(OSLIBS),$(DLKLIB)
+HEADERS = @,$(TCPIPLIB),@.^.Include,@.^.Modules,@.^.Objects,@.^.Python,$(CLIB),$(OSLIB),$(DLKLIB)
 
-CC = cc -c -j$(HEADERS) $(DLKFLAG) -DRISCOS -DHAVE_CONFIG_H -wad -throwback
-#-depend !Depend
-CCEXPAT = cc -c -j$(HEADERS),$(EXPAT) $(DLKFLAG) -DHAVE_EXPAT_H -DRISCOS -DHAVE_CONFIG_H -wad -throwback
+CFLAGS = -c  $(DLKFLAG) -DRISCOS -DHAVE_CONFIG_H -wadP -throwback -APCS 3/32bit/fpe3
+
+CC = cc $(CFLAGS) -j$(HEADERS)
+CCEXPAT = cc $(CFLAGS) -j$(HEADERS),$(EXPAT) -DHAVE_EXPAT_H
 
 LINK = link
 LINKFLAGS = -aif #-NOUNUSED #-d
-LOADLIBS = $(CLIB).o.Stubs $(OSLIB).o.OSLib $(DLKOBJS)
+LOADLIBS = $(TCPIPLIB).o.unixlib $(TCPIPLIB).o.inetlib $(TCPIPLIB).o.socklib $(CLIB).o.Stubs $(OSLIB).o.OSLib32 $(DLKOBJS)
+
+LIBFILE = libfile -c 
 
 
 .c.o  :
        $(CC) -o $@ $*.c
 
+MAIN_PYTHON =\
+	@.^.Modules.o.python
+
+LIB_PYTHON =\
+	@.^.LibPython
 
 # code for main Python binary
 MODULES_STATIC =\
-	@.^.Modules.o.python\
 	@.^.Modules.o.main\
-	Modules.o.config\
+	@.Modules.o.config\
 	@.^.Modules.o.getbuildinfo\
-	Modules.o.getpath_riscos\
-	Modules.o.riscosmodule
+	@.Modules.o.getpath_riscos\
+	@.Modules.o.riscosmodule\
+	@.^.Modules.o.gcmodule
 
 
 # dynamic Modules
@@ -85,7 +91,9 @@
 	@.^.Lib.pyexpat/pyd\
 	@.^.Lib.plat-riscos.drawf/pyd\
 	@.^.Lib.plat-riscos.swi/pyd\
-	@.^.Lib._sre/pyd
+	@.^.Lib._sre/pyd\
+	@.^.Lib.xxsubtype/pyd\
+	@.^.Lib._symtable/pyd
 
 
 OBJECTS_PYTHON =\
@@ -98,6 +106,7 @@
 	@.^.Python.o.pystate\
 	@.^.Python.o.pyfpe\
 	@.^.Python.o.mystrtoul\
+	@.^.Python.o.mysnprintf\
 	@.^.Python.o.modsupport\
 	@.^.Python.o.marshal\
 	@.^.Python.o.importdl\
@@ -141,6 +150,7 @@
 	@.^.Objects.o.longobject\
 	@.^.Objects.o.listobject\
 	@.^.Objects.o.intobject\
+	@.^.Objects.o.iterobject\
 	@.^.Objects.o.funcobject\
 	@.^.Objects.o.frameobject\
 	@.^.Objects.o.floatobject\
@@ -153,7 +163,8 @@
 	@.^.Objects.o.bufferobject\
 	@.^.Objects.o.abstract\
 	@.^.Objects.o.unicodectype\
-	@.^.Objects.o.unicodeobject
+	@.^.Objects.o.unicodeobject\
+	@.^.Objects.o.descrobject
 
 
 OBJECTS_PARSER =\
@@ -183,8 +194,11 @@
        $(CC) -DBUILD=$(BUILD) -o @.^.Modules.o.getbuildinfo @.^.Modules.c.getbuildinfo
 
 
-@.^.$(TARGET):  $(OBJECTS) o.linktab
-	$(LINK) -o @.^.$(TARGET) $(OBJECTS) $(LOADLIBS)
+$(LIB_PYTHON):	$(OBJECTS)
+	$(LIBFILE) $(LIB_PYTHON) $(OBJECTS)
+
+@.^.$(TARGET):  o.linktab $(MAIN_PYTHON) $(LIB_PYTHON)
+	$(LINK) -o @.^.$(TARGET) $(MAIN_PYTHON) @.^.LibPython $(LOADLIBS)
 
 
 #########################################################################
@@ -229,7 +243,7 @@
 	$(MAKEDLK) -d @.^.Lib.cStringIO/pyd -s s.linktab -o @.^.Modules.o.cStringIO -e initcStringIO
 
 @.^.Lib.plat-riscos.drawf/pyd: Modules.o.drawfmodule #s.linktab
-	$(LINK) -aof -o Modules.o.drawflink Modules.o.drawfmodule $(OSLIB).o.OSLIB
+	$(LINK) -aof -o Modules.o.drawflink Modules.o.drawfmodule $(OSLIB).o.OSLIB32
 	$(MAKEDLK) -d @.^.Lib.plat-riscos.drawf/pyd -s s.linktab -o Modules.o.drawflink -e initdrawf
 
 @.^.Lib.errno/pyd: @.^.Modules.o.errnomodule #s.linktab
@@ -277,9 +291,6 @@
 @.^.Lib.signal/pyd: @.^.Modules.o.signalmodule s.linktab
 	$(MAKEDLK) -d @.^.Lib.signal/pyd -s s.linktab -o @.^.Modules.o.signalmodule -e initsignal
 
-#@.^.Lib.soundex/pyd: @.^.Modules.o.soundex s.linktab
-#	$(MAKEDLK) -d @.^.Lib.soundex/pyd -s s.linktab -o @.^.Modules.o.soundex -e initsoundex
-
 @.^.Lib.strop/pyd: @.^.Modules.o.stropmodule s.linktab
 	$(MAKEDLK) -d @.^.Lib.strop/pyd -s s.linktab -o @.^.Modules.o.stropmodule -e initstrop
 
@@ -287,7 +298,7 @@
 	$(MAKEDLK) -d @.^.Lib.struct/pyd -s s.linktab -o @.^.Modules.o.structmodule -e initstruct
 
 @.^.Lib.plat-riscos.swi/pyd: Modules.o.swimodule s.linktab
-	$(LINK) -aof -o Modules.o.swilink Modules.o.swimodule $(OSLIB).o.OSLIB
+	$(LINK) -aof -o Modules.o.swilink Modules.o.swimodule $(OSLIB).o.OSLIB32
 	$(MAKEDLK) -d @.^.Lib.plat-riscos.swi/pyd -s s.linktab -o Modules.o.swilink -e initswi
 
 @.^.Lib._locale/pyd: @.^.Modules.o._localemodule s.linktab
@@ -311,28 +322,33 @@
 @.^.Lib.xreadlines/pyd: @.^.Modules.o.xreadlinesmodule s.linktab
 	$(MAKEDLK) -d @.^.Lib.xreadlines/pyd -s s.linktab -o @.^.Modules.o.xreadlinesmodule -e initxreadlines
 
+@.^.Lib.xxsubtype/pyd: @.^.Modules.o.xxsubtype s.linktab
+	$(MAKEDLK) -d @.^.Lib.xxsubtype/pyd -s s.linktab -o @.^.Modules.o.xxsubtype -e initxxsubtype
+
+@.^.Lib._symtable/pyd: @.^.Modules.o.symtablemodule s.linktab
+	$(MAKEDLK) -d @.^.Lib._symtable/pyd -s s.linktab -o @.^.Modules.o.symtablemodule -e init_symtable
 
 
 ############################################################################
 # Dynamic Modules with other dependencies
 #
 @.^.Lib.select/pyd:  @.^.Modules.o.selectmodule s.linktab
-	$(LINK) -aof -o @.^.Modules.o.selectlink @.^.Modules.o.selectmodule $(SOCKLIB).o.socklib
+	$(LINK) -aof -o @.^.Modules.o.selectlink @.^.Modules.o.selectmodule $(TCPIPLIB).o.socklib
 	$(MAKEDLK) -d @.^.Lib.select/pyd -s s.linktab -o @.^.Modules.o.selectlink -e initselect
 
 @.^.Modules.o.selectmodule: @.^.Modules.c.selectmodule
-	$(CC) -I$(SOCKLIB).include -o $@ @.^.Modules.c.selectmodule
+	$(CC) -I$(TCPIPLIB).include -o $@ @.^.Modules.c.selectmodule
 
 @.^.Lib._socket/pyd: @.^.Modules.o.socketmodule s.linktab 
-	$(LINK) -aof -o @.^.Modules.o._socketlink @.^.Modules.o.socketmodule $(SOCKLIB).o.inetlib $(SOCKLIB).o.unixlib $(SOCKLIB).o.socklib
+	$(LINK) -aof -o @.^.Modules.o._socketlink @.^.Modules.o.socketmodule $(TCPIPLIB).o.inetlib $(TCPIPLIB).o.unixlib $(TCPIPLIB).o.socklib
 	$(MAKEDLK) -d @.^.Lib._socket/pyd -s s.linktab -o @.^.Modules.o._socketlink -e init_socket
 
 @.^.Modules.o.socketmodule: @.^.Modules.c.socketmodule
-	$(CC) -I$(SOCKLIB).include -o $@ @.^.Modules.c.socketmodule
+	$(CC) -I$(TCPIPLIB).include -o $@ @.^.Modules.c.socketmodule
 
 
 @.^.Lib.zlib/pyd: @.^.Modules.o.zlibmodule s.linktab
-	$(LINK) -aof -o @.^.Modules.o.zliblink @.^.Modules.o.zlibmodule $(ZLIB).zlib_lib
+	$(LINK) -aof -o @.^.Modules.o.zliblink @.^.Modules.o.zlibmodule $(ZLIB).zlib
 	$(MAKEDLK) -d @.^.Lib.zlib/pyd -s s.linktab -o @.^.Modules.o.zliblink -e initzlib
 
 @.^.Modules.o.zlibmodule: @.^.Modules.c.zlibmodule
@@ -340,9 +356,13 @@
 
 
 @.^.Lib.time/pyd: @.^.Modules.o.timemodule s.linktab @.o.sleep
-	$(LINK) -aof -o @.^.Modules.o.timelink @.^.Modules.o.timemodule @.o.sleep $(OSLIB).o.OSLib
+	$(LINK) -aof -o @.^.Modules.o.timelink @.^.Modules.o.timemodule @.o.sleep $(OSLIB).o.OSLib32
 	$(MAKEDLK) -d @.^.Lib.time/pyd -s s.linktab -o @.^.Modules.o.timelink -e inittime
 
+#@.^.Lib.time/pyd: @.Modules.o.timemodule s.linktab
+#	$(LINK) -aof -o @.Modules.o.timelink @.Modules.o.timemodule $(OSLIB).o.OSLib32
+#	$(MAKEDLK) -d @.^.Lib.time/pyd -s s.linktab -o @.Modules.o.timelink -e inittime
+
 
 @.^.Lib.pyexpat/pyd: @.^.Modules.o.pyexpat s.linktab
 	$(LINK) -aof -o @.^.Modules.o.pyexpatlink @.^.Modules.o.pyexpat $(EXPAT).expat_lib
@@ -356,7 +376,7 @@
 # dynamic linking symbol table
 #
 o.linktab: s.linktab
-	ObjAsm s.linktab o.linktab
+	ObjAsm -APCS 3/32bit s.linktab o.linktab
 
 s.linktab: $(OBJECTS)
 	$(OBJSCAN) -s s.linktab -o $(OBJECTS) $(clib).o.stubs
@@ -365,42 +385,43 @@
 # special targets
 #
 libclean:
-	create @.^.Lib.dummy/pyc
-	create @.^.Lib.dummy/pyo
-	create @.^.Lib.plat-riscos.dummy/pyc
-	create @.^.Lib.plat-riscos.dummy/pyo
-	create @.^.Lib.test.dummy/pyc
-	create @.^.Lib.test.dummy/pyo
-	wipe @.^.Lib.*/pyc ~C~V
-	wipe @.^.Lib.*/pyo ~C~V
-	wipe @.^.Lib.plat-riscos.*/pyc ~C~V
-	wipe @.^.Lib.plat-riscos.*/pyo ~C~V
-	wipe @.^.Lib.test.*/pyc ~C~V
-	wipe @.^.Lib.test.*/pyo ~C~V
+	-wipe @.^.Lib.*/pyc ~C~V
+	-wipe @.^.Lib.*/pyo ~C~V
+	-wipe @.^.Lib.plat-riscos.*/pyc ~C~V
+	-wipe @.^.Lib.plat-riscos.*/pyo ~C~V
+	-wipe @.^.Lib.test.*/pyc ~C~V
+	-wipe @.^.Lib.test.*/pyo ~C~V
+	-wipe @.^.Lib.encodings.*/pyc ~C~V
+	-wipe @.^.Lib.encodings.*/pyo ~C~V
+	-wipe @.^.Lib.curses.*/pyc ~C~V
+	-wipe @.^.Lib.curses.*/pyo ~C~V
+	-wipe @.^.Lib.xml.*/pyc ~C~V
+	-wipe @.^.Lib.xml.*/pyo ~C~V
+	-wipe @.^.Lib.xml.sax.*/pyc ~C~V
+	-wipe @.^.Lib.xml.sax.*/pyo ~C~V
+	-wipe @.^.Lib.xml.dom.*/pyc ~C~V
+	-wipe @.^.Lib.xml.dom.*/pyo ~C~V
+	-wipe @.^.Lib.xml.parsers.*/pyc ~C~V
+	-wipe @.^.Lib.xml.parsers.*/pyo ~C~V
 
 clean: libclean
-	create @.^.Objects.o.dummy
-	create @.^.Parser.o.dummy
-	create @.^.Modules.o.dummy
-	create o.dummy
-	create @.^.Python.o.dummy
-	wipe @.^.Modules.o.* ~C ~V
-	wipe @.^.Objects.o.* ~C ~V
-	wipe @.^.Parser.o.* ~C ~V
-	wipe @.^.Python.o.* ~C ~V
-	wipe o.* ~C ~V
+	-wipe @.^.Modules.o.* ~C~V
+	-wipe @.^.Objects.o.* ~C~V
+	-wipe @.^.Parser.o.* ~C~V
+	-wipe @.^.Python.o.* ~C~V
+	-wipe @.Modules.o.* ~C~V
+	-wipe @.Python.o.* ~C~V
+	-wipe @.o.* ~C ~V
 
-rebuild: clean
-	create @.^.Lib.dummy/pyd
-	create @.^.$(TARGET)
-	create @.^.Lib.plat-riscos.dummy/pyd
-	create s.linktab
-	create o.linktab
-	wipe @.^.$(TARGET) ~C~V
-	wipe @.^.Lib.*/pyd ~C ~V
-	wipe @.^.Lib.plat-riscos.*/pyd ~C~V
-	wipe s.linktab ~C~V
-	wipe o.linktab ~C~V
+rebuild: clean clean-support
+	remove @.^.$(TARGET)
+	-wipe @.^.Lib.*/pyd ~C ~V
+	-wipe @.^.Lib.plat-riscos.*/pyd ~C~V
+	remove s.linktab
+
+clean-support:
+	-wipe @.^.!* ~C~V
+	remove @.^.AddToPath
 
 cdirs:
 	cdir @.Modules.o
diff --git a/RISCOS/pyconfig.h b/RISCOS/pyconfig.h
index 11a294c..7934fa4 100644
--- a/RISCOS/pyconfig.h
+++ b/RISCOS/pyconfig.h
@@ -1,4 +1,4 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* RISCOS/pyconfig.h: Python configuration for RISC OS  */
 
 /* Define if on AIX 3.
    System headers sometimes define this.
@@ -8,13 +8,15 @@
 #endif
 
 /* Define if type char is unsigned and you are not using gcc.  */
+#ifndef __CHAR_UNSIGNED__
 #undef __CHAR_UNSIGNED__
+#endif
 
 /* Define to empty if the keyword does not work.  */
 #undef const
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
-#define gid_t int
+#undef gid_t
 
 /* Define if your struct tm has tm_zone.  */
 #undef HAVE_TM_ZONE
@@ -27,13 +29,13 @@
 #undef _MINIX
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
-#define mode_t int
+#undef mode_t
 
 /* Define to `long' if <sys/types.h> doesn't define.  */
-#define off_t long
+#undef off_t
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
-#define pid_t int
+#undef pid_t
 
 /* Define if the system does not provide POSIX.1 features except
    with this defined.  */
@@ -58,7 +60,15 @@
 #define TM_IN_SYS_TIME 1
 
 /* Define to `int' if <sys/types.h> doesn't define.  */
-#define uid_t int
+#undef uid_t
+
+/* Define if your processor stores words with the most significant
+   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
+#undef WORDS_BIGENDIAN
+
+/* Define for AIX if your compiler is a genuine IBM xlC/xlC_r
+   and you want support for AIX C++ shared extension modules. */
+#undef AIX_GENUINE_CPLUSPLUS
 
 /* Define if your <unistd.h> contains bad prototypes for exec*()
    (as it does on SGI IRIX 4.x) */
@@ -77,11 +87,11 @@
 /* Define to `long' if <time.h> doesn't define.  */
 #undef clock_t
 
-/* Used for BeOS configuration */
-#undef DL_EXPORT_HEADER
-#ifdef DL_EXPORT_HEADER
-#include DL_EXPORT_HEADER
-#endif
+/* Defined on Solaris to see additional function prototypes. */
+#undef __EXTENSIONS__
+
+/* This must be set to 64 on some systems to enable large file support */
+#undef _FILE_OFFSET_BITS
 
 /* Define if getpgrp() must be called as getpgrp(0). */
 #undef GETPGRP_HAVE_ARG
@@ -93,6 +103,24 @@
 /* Define this if your time.h defines altzone */
 #undef HAVE_ALTZONE
 
+/* Define if --enable-ipv6 is specified */
+#undef ENABLE_IPV6
+
+/* Define if sockaddr has sa_len member */
+#undef HAVE_SOCKADDR_SA_LEN
+
+/* struct addrinfo (netdb.h) */
+#undef HAVE_ADDRINFO
+
+/* struct sockaddr_storage (sys/socket.h) */
+#undef HAVE_SOCKADDR_STORAGE
+
+/* Defined when any dynamic module loading is enabled */
+#define HAVE_DYNAMIC_LOADING 1
+
+/* Define this if you have flockfile(), getc_unlocked(), and funlockfile() */
+#undef HAVE_GETC_UNLOCKED
+
 /* Define this if you have some version of gethostbyname_r() */
 #undef HAVE_GETHOSTBYNAME_R
 
@@ -105,25 +133,66 @@
 /* Define this if you have the 6-arg version of gethostbyname_r() */
 #undef HAVE_GETHOSTBYNAME_R_6_ARG
 
+/* Defined to enable large file support when an off_t is bigger than a long
+   and long long is available and at least as big as an off_t. You may need
+   to add some flags for configuration and compilation to enable this mode.
+   E.g, for Solaris 2.7:
+   CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" OPT="-O2 $CFLAGS" \
+ configure
+*/
+#undef HAVE_LARGEFILE_SUPPORT
+
 /* Define this if you have the type long long */
 #undef HAVE_LONG_LONG
 
-/* Define this if you have a K&R style C preprocessor */
-#undef HAVE_OLD_CPP
-
 /* Define if your compiler supports function prototypes */
 #define HAVE_PROTOTYPES 1
 
+/* Define if you have GNU PTH threads */
+#undef HAVE_PTH
+
+/* Define if you have readline 4.2 */
+#undef HAVE_RL_COMPLETION_MATCHES
+
 /* Define if your compiler supports variable length function prototypes
    (e.g. void fprintf(FILE *, char *, ...);) *and* <stdarg.h> */
 #define HAVE_STDARG_PROTOTYPES 1
 
+/* Define this if you have the type uintptr_t */
+#undef HAVE_UINTPTR_T
+
+/* Define if you have a useable wchar_t type defined in wchar.h; useable
+   means wchar_t must be 16-bit unsigned type. (see
+   Include/unicodeobject.h). */
+#undef HAVE_USABLE_WCHAR_T
+
+/* Define if the compiler provides a wchar.h header file. */
+#undef HAVE_WCHAR_H
+
+/* This must be defined on some systems to enable large file support */
+#undef _LARGEFILE_SOURCE
+
+/* Define if you want to have a Unicode type. */
+#define Py_USING_UNICODE 1
+
+/* Define as the integral type used for Unicode representation. */
+#define PY_UNICODE_TYPE unsigned short
+
+/* Define as the size of the unicode type. */
+#define Py_UNICODE_SIZE 2
+
+/* Define if nice() returns success/failure instead of the new priority. */
+#undef HAVE_BROKEN_NICE
+
 /* Define if malloc(0) returns a NULL pointer */
 #undef MALLOC_ZERO_RETURNS_NULL
 
 /* Define if you have POSIX threads */
 #undef _POSIX_THREADS
 
+/* Define if you want to build an interpreter with many run-time checks  */
+#undef Py_DEBUG
+
 /* Define to force use of thread-safe errno, h_errno, and other functions */
 #undef _REENTRANT
 
@@ -133,6 +202,23 @@
 /* Define to empty if the keyword does not work.  */
 #undef signed
 
+/* Define if i>>j for signed int i does not extend the sign bit
+   when i < 0
+*/
+#undef SIGNED_RIGHT_SHIFT_ZERO_FILLS
+
+/* The number of bytes in an off_t. */
+#define SIZEOF_OFF_T 4
+
+/* The number of bytes in a time_t. */
+#define SIZEOF_TIME_T 4
+
+/* The number of bytes in a pthread_t. */
+#undef SIZEOF_PTHREAD_T
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#define socklen_t int
+
 /* Define if  you can safely include both <sys/select.h> and <sys/time.h>
    (which you can't on SCO ODT 3.0). */
 #undef SYS_SELECT_WITH_SYS_TIME
@@ -146,12 +232,12 @@
 /* Define if you want SIGFPE handled (see Include/pyfpe.h). */
 #undef WANT_SIGFPE_HANDLER
 
-/* Define if you want to use SGI (IRIX 4) dynamic linking.
-   This requires the "dl" library by Jack Jansen,
-   ftp://ftp.cwi.nl/pub/dynload/dl-1.6.tar.Z.
-   Don't bother on IRIX 5, it already has dynamic linking using SunOS
-   style shared libraries */
-#undef WITH_SGI_DL
+/* Define if you want wctype.h functions to be used instead of the
+   one supplied by Python itself. (see Include/unicodectype.h). */
+#undef WANT_WCTYPE_FUNCTIONS
+
+/* Define if you want to compile in cycle garbage collection */
+#define WITH_CYCLE_GC 1
 
 /* Define if you want to emulate SGI (IRIX 4) dynamic linking.
    This is rumoured to work on VAX (Ultrix), Sun3 (SunOS 3.4),
@@ -161,7 +247,7 @@
    as well as the "GNU dld" library,
    ftp://ftp.cwi.nl/pub/dynload/dld-3.2.3.tar.Z.
    Don't bother on SunOS 4 or 5, they already have dynamic linking using
-   shared libraries */
+   shared libraries */ 
 #undef WITH_DL_DLD
 
 /* Define if you want to use the new-style (Openstep, Rhapsody, MacOS)
@@ -169,27 +255,37 @@
    linker (rld). Dyld is necessary to support frameworks. */
 #undef WITH_DYLD
 
-/* Define if you want to compile in rudimentary thread support */
-#undef WITH_THREAD
+/* Define if you want to compile in Python-specific mallocs */
+#undef WITH_PYMALLOC
 
 /* Define if you want to produce an OpenStep/Rhapsody framework
    (shared library plus accessory files). */
 #undef WITH_NEXT_FRAMEWORK
 
-/* The number of bytes in an off_t. */
-#undef SIZEOF_OFF_T
+/* Define if you want to use MacPython modules on MacOSX in unix-Python */
+#undef USE_TOOLBOX_OBJECT_GLUE
 
-/* Defined to enable large file support when an off_t is bigger than a long
-   and long long is available and at least as big as an off_t. You may need
-   to add some flags for configuration and compilation to enable this mode.
-   E.g, for Solaris 2.7:
-   CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" OPT="-O2 $CFLAGS" \
- configure
-*/
-#undef HAVE_LARGEFILE_SUPPORT
+/* Define if you want to use SGI (IRIX 4) dynamic linking.
+   This requires the "dl" library by Jack Jansen,
+   ftp://ftp.cwi.nl/pub/dynload/dl-1.6.tar.Z.
+   Don't bother on IRIX 5, it already has dynamic linking using SunOS
+   style shared libraries */ 
+#undef WITH_SGI_DL
 
-/* The number of bytes in a time_t. */
-#define SIZEOF_TIME_T 4
+/* Define if you want to compile in rudimentary thread support */
+#undef WITH_THREAD
+
+/* The number of bytes in a char.  */
+#define SIZEOF_CHAR 1
+
+/* The number of bytes in a double.  */
+#define SIZEOF_DOUBLE 8
+
+/* The number of bytes in a float.  */
+#define SIZEOF_FLOAT 4
+
+/* The number of bytes in a fpos_t.  */
+#undef SIZEOF_FPOS_T
 
 /* The number of bytes in a int.  */
 #define SIZEOF_INT 4
@@ -200,9 +296,21 @@
 /* The number of bytes in a long long.  */
 #undef SIZEOF_LONG_LONG
 
+/* The number of bytes in a short.  */
+#define SIZEOF_SHORT 2
+
+/* The number of bytes in a uintptr_t.  */
+#undef SIZEOF_UINTPTR_T
+
 /* The number of bytes in a void *.  */
 #define SIZEOF_VOID_P 4
 
+/* The number of bytes in a wchar_t.  */
+#undef SIZEOF_WCHAR_T
+
+/* Define if you have the _getpty function.  */
+#undef HAVE__GETPTY
+
 /* Define if you have the alarm function.  */
 #undef HAVE_ALARM
 
@@ -212,6 +320,15 @@
 /* Define if you have the clock function.  */
 #define HAVE_CLOCK 1
 
+/* Define if you have the confstr function.  */
+#undef HAVE_CONFSTR
+
+/* Define if you have the ctermid function.  */
+#undef HAVE_CTERMID
+
+/* Define if you have the ctermid_r function.  */
+#undef HAVE_CTERMID_R
+
 /* Define if you have the dlopen function.  */
 #undef HAVE_DLOPEN
 
@@ -230,6 +347,12 @@
 /* Define if you have the fork function.  */
 #undef HAVE_FORK
 
+/* Define if you have the forkpty function.  */
+#undef HAVE_FORKPTY
+
+/* Define if you have the fpathconf function.  */
+#undef HAVE_FPATHCONF
+
 /* Define if you have the fseek64 function.  */
 #undef HAVE_FSEEK64
 
@@ -254,9 +377,27 @@
 /* Define if you have the ftruncate function.  */
 #undef HAVE_FTRUNCATE
 
+/* Define if you have the gai_strerror function.  */
+#undef HAVE_GAI_STRERROR
+
+/* Define if you have the getaddrinfo function.  */
+#undef HAVE_GETADDRINFO
+
 /* Define if you have the getcwd function.  */
 #undef HAVE_GETCWD
 
+/* Define if you have the getgroups function.  */
+#undef HAVE_GETGROUPS
+
+/* Define if you have the gethostbyname function.  */
+#undef HAVE_GETHOSTBYNAME
+
+/* Define if you have the getlogin function.  */
+#undef HAVE_GETLOGIN
+
+/* Define if you have the getnameinfo function.  */
+#undef HAVE_GETNAMEINFO
+
 /* Define if you have the getpeername function.  */
 #undef HAVE_GETPEERNAME
 
@@ -266,6 +407,9 @@
 /* Define if you have the getpid function.  */
 #undef HAVE_GETPID
 
+/* Define if you have the getpriority function.  */
+#undef HAVE_GETPRIORITY
+
 /* Define if you have the getpwent function.  */
 #undef HAVE_GETPWENT
 
@@ -275,9 +419,15 @@
 /* Define if you have the getwd function.  */
 #undef HAVE_GETWD
 
+/* Define if you have the hstrerror function.  */
+#undef HAVE_HSTRERROR
+
 /* Define if you have the hypot function.  */
 #undef HAVE_HYPOT
 
+/* Define if you have the inet_pton function.  */
+#define HAVE_INET_PTON 1
+
 /* Define if you have the kill function.  */
 #undef HAVE_KILL
 
@@ -296,15 +446,27 @@
 /* Define if you have the mktime function.  */
 #define HAVE_MKTIME 1
 
+/* Define if you have the mremap function.  */
+#undef HAVE_MREMAP
+
 /* Define if you have the nice function.  */
 #undef HAVE_NICE
 
+/* Define if you have the openpty function.  */
+#undef HAVE_OPENPTY
+
+/* Define if you have the pathconf function.  */
+#undef HAVE_PATHCONF
+
 /* Define if you have the pause function.  */
 #undef HAVE_PAUSE
 
 /* Define if you have the plock function.  */
 #undef HAVE_PLOCK
 
+/* Define if you have the poll function.  */
+#undef HAVE_POLL
+
 /* Define if you have the pthread_init function.  */
 #undef HAVE_PTHREAD_INIT
 
@@ -317,11 +479,17 @@
 /* Define if you have the select function.  */
 #undef HAVE_SELECT
 
+/* Define if you have the setegid function.  */
+#undef HAVE_SETEGID
+
+/* Define if you have the seteuid function.  */
+#undef HAVE_SETEUID
+
 /* Define if you have the setgid function.  */
 #undef HAVE_SETGID
 
 /* Define if you have the setlocale function.  */
-#undef HAVE_SETLOCALE
+#define HAVE_SETLOCALE 1
 
 /* Define if you have the setpgid function.  */
 #undef HAVE_SETPGID
@@ -329,6 +497,12 @@
 /* Define if you have the setpgrp function.  */
 #undef HAVE_SETPGRP
 
+/* Define if you have the setregid function.  */
+#undef HAVE_SETREGID
+
+/* Define if you have the setreuid function.  */
+#undef HAVE_SETREUID
+
 /* Define if you have the setsid function.  */
 #undef HAVE_SETSID
 
@@ -347,11 +521,14 @@
 /* Define if you have the sigrelse function.  */
 #undef HAVE_SIGRELSE
 
+/* Define if you have the snprintf function.  */
+#undef HAVE_SNPRINTF
+
 /* Define if you have the statvfs function.  */
 #undef HAVE_STATVFS
 
 /* Define if you have the strdup function.  */
-#undef HAVE_STRDUP
+#define HAVE_STRDUP 1
 
 /* Define if you have the strerror function.  */
 #define HAVE_STRERROR 1
@@ -365,18 +542,33 @@
 /* Define if you have the symlink function.  */
 #undef HAVE_SYMLINK
 
+/* Define if you have the sysconf function.  */
+#undef HAVE_SYSCONF
+
 /* Define if you have the tcgetpgrp function.  */
 #undef HAVE_TCGETPGRP
 
 /* Define if you have the tcsetpgrp function.  */
 #undef HAVE_TCSETPGRP
 
+/* Define if you have the tempnam function.  */
+#undef HAVE_TEMPNAM
+
 /* Define if you have the timegm function.  */
 #undef HAVE_TIMEGM
 
 /* Define if you have the times function.  */
 #undef HAVE_TIMES
 
+/* Define if you have the tmpfile function.  */
+#undef HAVE_TMPFILE
+
+/* Define if you have the tmpnam function.  */
+#undef HAVE_TMPNAM
+
+/* Define if you have the tmpnam_r function.  */
+#undef HAVE_TMPNAM_R
+
 /* Define if you have the truncate function.  */
 #undef HAVE_TRUNCATE
 
@@ -386,6 +578,15 @@
 /* Define if you have the waitpid function.  */
 #undef HAVE_WAITPID
 
+/* Define if you have the <db.h> header file.  */
+#undef HAVE_DB_H
+
+/* Define if you have the <db1/ndbm.h> header file.  */
+#undef HAVE_DB1_NDBM_H
+
+/* Define if you have the <db_185.h> header file.  */
+#undef HAVE_DB_185_H
+
 /* Define if you have the <dirent.h> header file.  */
 #undef HAVE_DIRENT_H
 
@@ -395,6 +596,15 @@
 /* Define if you have the <fcntl.h> header file.  */
 #undef HAVE_FCNTL_H
 
+/* Define if you have the <gdbm/ndbm.h> header file.  */
+#undef HAVE_GDBM_NDBM_H
+
+/* Define if you have the <langinfo.h> header file.  */
+#undef HAVE_LANGINFO_H
+
+/* Define if you have the <libutil.h> header file.  */
+#undef HAVE_LIBUTIL_H
+
 /* Define if you have the <limits.h> header file.  */
 #define HAVE_LIMITS_H 1
 
@@ -404,12 +614,24 @@
 /* Define if you have the <ncurses.h> header file.  */
 #undef HAVE_NCURSES_H
 
+/* Define if you have the <ndbm.h> header file.  */
+#undef HAVE_NDBM_H
+
 /* Define if you have the <ndir.h> header file.  */
 #undef HAVE_NDIR_H
 
+/* Define if you have the <netpacket/packet.h> header file.  */
+#undef HAVE_NETPACKET_PACKET_H
+
+/* Define if you have the <poll.h> header file.  */
+#undef HAVE_POLL_H
+
 /* Define if you have the <pthread.h> header file.  */
 #undef HAVE_PTHREAD_H
 
+/* Define if you have the <pty.h> header file.  */
+#undef HAVE_PTY_H
+
 /* Define if you have the <signal.h> header file.  */
 #define HAVE_SIGNAL_H 1
 
@@ -434,15 +656,27 @@
 /* Define if you have the <sys/lock.h> header file.  */
 #undef HAVE_SYS_LOCK_H
 
+/* Define if you have the <sys/modem.h> header file.  */
+#undef HAVE_SYS_MODEM_H
+
 /* Define if you have the <sys/ndir.h> header file.  */
 #undef HAVE_SYS_NDIR_H
 
 /* Define if you have the <sys/param.h> header file.  */
 #undef HAVE_SYS_PARAM_H
 
+/* Define if you have the <sys/poll.h> header file.  */
+#undef HAVE_SYS_POLL_H
+
+/* Define if you have the <sys/resource.h> header file.  */
+#undef HAVE_SYS_RESOURCE_H
+
 /* Define if you have the <sys/select.h> header file.  */
 #undef HAVE_SYS_SELECT_H
 
+/* Define if you have the <sys/socket.h> header file.  */
+#undef HAVE_SYS_SOCKET_H
+
 /* Define if you have the <sys/time.h> header file.  */
 #undef HAVE_SYS_TIME_H
 
@@ -458,11 +692,14 @@
 /* Define if you have the <sys/wait.h> header file.  */
 #undef HAVE_SYS_WAIT_H
 
+/* Define if you have the <termios.h> header file.  */
+#undef HAVE_TERMIOS_H
+
 /* Define if you have the <thread.h> header file.  */
 #undef HAVE_THREAD_H
 
 /* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
+#define HAVE_UNISTD_H 1
 
 /* Define if you have the <utime.h> header file.  */
 #undef HAVE_UTIME_H
@@ -476,13 +713,24 @@
 /* Define if you have the ieee library (-lieee).  */
 #undef HAVE_LIBIEEE
 
-#define DONT_HAVE_SYS_TYPES_H 1
+#ifdef __CYGWIN__
+#ifdef USE_DL_IMPORT
+#define DL_IMPORT(RTYPE) __declspec(dllimport) RTYPE
+#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE
+#else
+#define DL_IMPORT(RTYPE) __declspec(dllexport) RTYPE
+#define DL_EXPORT(RTYPE) __declspec(dllexport) RTYPE
+#endif
+#endif
+
+/* Define the macros needed if on a UnixWare 7.x system. */
+#if defined(__USLC__) && defined(__SCO_VERSION__)
+#define STRICT_SYSV_CURSES /* Don't use ncurses extensions */
+#endif
+
 
 #define DONT_HAVE_FSTAT 1
 #define DONT_HAVE_STAT  1
-#define DONT_HAVE_SYS_STAT_H  1
+#undef DONT_HAVE_SYS_STAT_H
 
-#define PLATFORM "RISCOS"
-
-#define socklen_t int
-#define HAVE_DYNAMIC_LOADING
+#define PLATFORM "riscos"