Re: RISC OS port

"James Moore" <jmoore@php.net> wrote: > > > There's only a handful of small patches to various files, and a new SAPI > > module. Should I post the changes to this list, mail them to someone, or > > apply for a CVS account? I don't envisage too many more changes, but > > there might be the odd thing now and again if other peoples changes > > cause things to break. > > Post them to the list for review then if they are to be incorporated then > you need to apply for a CVS account and you will be given access to the > relevant parts of the code. OK, here they are. In some places I've used #ifdef riscos as this is defined by the compiler. It looks a bit odd though as it is not upper case. Alex -- Alex Waugh alex@alexwaugh.com RISC OS software from http://www.alexwaugh.com/

Index: ext/ftp/ftp.c =================================================================== RCS file: /repository/php4/ext/ftp/ftp.c,v retrieving revision 1.37 diff -u -r1.37 ftp.c --- ext/ftp/ftp.c 9 Sep 2001 13:28:49 -0000 1.37 +++ ext/ftp/ftp.c 10 Sep 2001 20:00:16 -0000 @@ -44,6 +44,10 @@ #include <sys/time.h> #endif +#ifdef HAVE_SYS_SELECT_H +#include <sys/select.h> +#endif + #include "ftp.h" #include "ext/standard/fsock.h" Index: ext/mysql/libmysql/global.h =================================================================== RCS file: /repository/php4/ext/mysql/libmysql/global.h,v retrieving revision 1.8 diff -u -r1.8 global.h --- ext/mysql/libmysql/global.h 1 Jun 2001 20:07:26 -0000 1.8 +++ ext/mysql/libmysql/global.h 10 Sep 2001 20:00:22 -0000 @@ -250,6 +250,8 @@ #endif #if defined(__EMX__) || !defined(HAVE_UINT) +#undef uint +#undef ushort typedef unsigned int uint; typedef unsigned short ushort; #endif Index: ext/standard/fsock.c =================================================================== RCS file: /repository/php4/ext/standard/fsock.c,v retrieving revision 1.80 diff -u -r1.80 fsock.c --- ext/standard/fsock.c 9 Sep 2001 13:29:18 -0000 1.80 +++ ext/standard/fsock.c 10 Sep 2001 20:00:39 -0000 @@ -52,7 +52,7 @@ #include <arpa/inet.h> #endif #endif -#ifdef PHP_WIN32 +#if defined(PHP_WIN32) || defined(riscos) #undef AF_UNIX #endif #if defined(AF_UNIX) Index: main/network.c =================================================================== RCS file: /repository/php4/main/network.c,v retrieving revision 1.21 diff -u -r1.21 network.c --- main/network.c 9 Sep 2001 13:29:28 -0000 1.21 +++ main/network.c 10 Sep 2001 20:00:43 -0000 @@ -37,6 +37,10 @@ #include <fcntl.h> #endif +#ifdef HAVE_SYS_SELECT_H +#include <sys/select.h> +#endif + #ifndef PHP_WIN32 #include <netinet/in.h> #include <netdb.h> Index: cgi_main.c =================================================================== RCS file: /repository/php4/sapi/cgi/cgi_main.c,v retrieving revision 1.134 diff -u -r1.134 cgi_main.c --- cgi_main.c 9 Sep 2001 13:29:30 -0000 1.134 +++ cgi_main.c 10 Sep 2001 21:32:59 -0000 @@ -64,6 +64,10 @@ #include <signal.h> #endif +#ifdef riscos +#include <unixlib/local.h> +#endif + #include "zend_compile.h" #include "zend_execute.h" #include "zend_highlight.h" @@ -703,6 +707,11 @@ env_path_translated = getenv("PATH_TRANSLATED"); #endif if(env_path_translated) { +#ifdef riscos + /* Convert path to unix format*/ + __riscosify_control|=__RISCOSIFY_DONT_CHECK_DIR; + env_path_translated=__unixify(env_path_translated,0,NULL,1,0); +#endif SG(request_info).path_translated = estrdup(env_path_translated); } } Index: TSRM/tsrm_virtual_cwd.h =================================================================== RCS file: /repository/TSRM/tsrm_virtual_cwd.h,v retrieving revision 1.15 diff -u -r1.15 tsrm_virtual_cwd.h --- TSRM/tsrm_virtual_cwd.h 2001/08/05 01:34:40 1.15 +++ TSRM/tsrm_virtual_cwd.h 2001/09/10 20:03:28 @@ -62,7 +62,11 @@ #endif #define DEFAULT_SLASH '/' -#define DEFAULT_DIR_SEPARATOR ':' +#ifdef riscos +# define DEFAULT_DIR_SEPARATOR ';' +#else +# define DEFAULT_DIR_SEPARATOR ':' +#endif #define IS_SLASH(c) ((c) == '/') #endif Index: Zend/zend.h =================================================================== RCS file: /repository/Zend/zend.h,v retrieving revision 1.139 diff -u -r1.139 zend.h --- Zend/zend.h 2001/08/26 15:28:05 1.139 +++ Zend/zend.h 2001/09/10 20:03:36 @@ -40,6 +40,9 @@ #ifdef ZEND_WIN32 # include "zend_config.w32.h" # define ZEND_PATHS_SEPARATOR ';' +#elif defined(riscos) +# include "zend_config.h" +# define ZEND_PATHS_SEPARATOR ';' #else # include "zend_config.h" # define ZEND_PATHS_SEPARATOR ':' Attachment: [application/gzip] sapi.tar.gz