From: David Hedbor <neotron@php.net>
Date: Tue, 29 Feb 2000 01:11:16 +0000 (+0000)
Subject: roxen.c
X-Git-Tag: PHP-4.0-RC1~353
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e616b5a31f065e3bb128d46cfa890512ab40bc8;p=php

roxen.c
---

diff --git a/sapi/roxen/roxen.c b/sapi/roxen/roxen.c
index 6d83afc8fd..1c9402f6de 100644
--- 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 {