summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main/php.h2
-rw-r--r--sapi/cgi/cgi_main.c1
2 files changed, 2 insertions, 1 deletions
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"