From b7d6d705f1e471544418cf8febb62943ece9e8ce Mon Sep 17 00:00:00 2001
From: Alex Waugh <alexwaugh@php.net>
Date: Tue, 7 Mar 2006 22:37:18 +0000
Subject: [PATCH] Fix for RISC OS

---
 main/php.h          | 2 +-
 sapi/cgi/cgi_main.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/main/php.h b/main/php.h
index b8b107ca058..a4394337a79 100644
--- a/main/php.h
+++ b/main/php.h
@@ -415,7 +415,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 cbba5c873f1..8fe28acf041 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"