roxen.c

diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index 6d83afc8fdd1191815d5ce4158ea00d662249c15..1c9402f6dec17752152ed0c37beac5ed5a2aa3c0 100644 (file)
--- a/sapi/roxen/roxen.c
+++ b/sapi/roxen/roxen.c
@@ -59,6 +59,13 @@
 #include <builtin_functions.h>
 #include <operators.h>
 
+
+/* sp and fp was changed to Pike_?p to avoid conflicts with embedded perl */
+#ifndef sp
+#define sp Pike_sp
+#define fp Pike_fp
+#endif
+
 /* php_roxen_request is per-request object storage */
 
 typedef struct {