MFH Fix for RISC OS

diff --git a/main/php.h b/main/php.h
index 0dbb55c570026ac6582e390d16b9312f854b1bdb..001a27702922c12eb0b65ade4567aef185df4a43 100644 (file)
--- 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 3d33dff573f42111b7124263a5ca0c2a5f4a438c..5cc3d25e86cfb133c51357e5b949079751e14776 100644 (file)
--- 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"