alexwaugh Tue Mar 7 22:37:19 2006 UTC Modified files: /php-src/main php.h /php-src/sapi/cgi cgi_main.c Log: Fix for RISC OS http://cvs.php.net/viewcvs.cgi/php-src/main/php.h?r1=1.227&r2=1.228&diff_format=u Index: php-src/main/php.h diff -u php-src/main/php.h:1.227 php-src/main/php.h:1.228 --- php-src/main/php.h:1.227 Fri Feb 24 13:30:21 2006 +++ php-src/main/php.h Tue Mar 7 22:37:18 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php.h,v 1.227 2006/02/24 13:30:21 helly Exp $ */ +/* $Id: php.h,v 1.228 2006/03/07 22:37:18 alexwaugh Exp $ */ #ifndef PHP_H #define PHP_H @@ -415,7 +415,7 @@ */ #ifndef XtOffset -#if defined(CRAY) || (defined(__arm) && !defined(LINUX)) +#if defined(CRAY) || (defined(__arm) && !(defined(LINUX) || defined(__riscos__))) #ifdef __STDC__ #define XtOffset(p_type, field) _Offsetof(p_type, field) #else http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.276&r2=1.277&diff_format=u Index: php-src/sapi/cgi/cgi_main.c diff -u php-src/sapi/cgi/cgi_main.c:1.276 php-src/sapi/cgi/cgi_main.c:1.277 --- php-src/sapi/cgi/cgi_main.c:1.276 Mon Feb 13 10:23:58 2006 +++ php-src/sapi/cgi/cgi_main.c Tue Mar 7 22:37:18 2006 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cgi_main.c,v 1.276 2006/02/13 10:23:58 dmitry Exp $ */ +/* $Id: cgi_main.c,v 1.277 2006/03/07 22:37:18 alexwaugh Exp $ */ #include "php.h" #include "php_globals.h" @@ -69,6 +69,7 @@ #ifdef __riscos__ #include <unixlib/local.h> +int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS; #endif #include "zend_compile.h"
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php