alexwaugh Tue Mar 7 22:37:53 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/main php.h
/php-src/sapi/cgi cgi_main.c
Log:
MFH Fix for RISC OS
http://cvs.php.net/viewcvs.cgi/php-src/main/php.h?r1=1.221.2.3&r2=1.221.2.4&diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.221.2.3 php-src/main/php.h:1.221.2.4
--- php-src/main/php.h:1.221.2.3 Sat Feb 25 18:25:44 2006
+++ php-src/main/php.h Tue Mar 7 22:37:53 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.221.2.3 2006/02/25 18:25:44 helly Exp $ */
+/* $Id: php.h,v 1.221.2.4 2006/03/07 22:37:53 alexwaugh Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -417,7 +417,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.267.2.7&r2=1.267.2.8&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.7
php-src/sapi/cgi/cgi_main.c:1.267.2.8
--- php-src/sapi/cgi/cgi_main.c:1.267.2.7 Fri Feb 3 16:30:09 2006
+++ php-src/sapi/cgi/cgi_main.c Tue Mar 7 22:37:53 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.267.2.7 2006/02/03 16:30:09 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.8 2006/03/07 22:37:53 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
