summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorDavid Hedbor <neotron@php.net>2000-02-29 01:11:16 +0000
committerDavid Hedbor <neotron@php.net>2000-02-29 01:11:16 +0000
commit3e616b5a31f065e3bb128d46cfa890512ab40bc8 (patch)
treed6760da7baea3dfc6269586073c844c0e34e29b7 /sapi
parent97cea1b9334573ef1cb6cfa094dd207340137ad1 (diff)
downloadphp-git-3e616b5a31f065e3bb128d46cfa890512ab40bc8.tar.gz
roxen.c
Diffstat (limited to 'sapi')
-rw-r--r--sapi/roxen/roxen.c7
1 files changed, 7 insertions, 0 deletions
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 {