From: Alex Waugh <alexwaugh@php.net>
Date: Tue, 7 Mar 2006 22:37:53 +0000 (+0000)
Subject: MFH Fix for RISC OS
X-Git-Tag: php-5.1.3RC1~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8d26da1be6e939b5beae0b46d567bf367f1ee33;p=php

MFH Fix for RISC OS
---

diff --git a/main/php.h b/main/php.h
index 0dbb55c570..001a277029 100644
--- a/main/php.h
+++ b/main/php.h
@@ -417,7 +417,7 @@ END_EXTERN_C()
  */
 
 #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
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 3d33dff573..5cc3d25e86 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -69,6 +69,7 @@
 
 #ifdef __riscos__
 #include <unixlib/local.h>
+int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
 #endif
 
 #include "zend_compile.h"