From: Zeev Suraski <zeev@php.net>
Date: Tue, 19 Sep 2000 17:53:09 +0000 (+0000)
Subject: Fix a few build bugs, still no go
X-Git-Tag: php-4.0.3RC1~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b0ca1585a6be1e9d653ee29d5bd19ea0ffa2466;p=php

Fix a few build bugs, still no go
---

diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index 8ae8a4d217..ebf82926da 100644
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -22,7 +22,10 @@
 
 #ifdef TRANS_SID
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -107,7 +110,7 @@ static char *check_tag_arg[] = {
 	NULL
 };
 
-static inline void tag_arg(url_adapt_state_t *ctx PLS_CC)
+static inline void tag_arg(url_adapt_state_t *ctx PLS_DC)
 {
 	char f = 0;
 	int i;
@@ -585,7 +588,7 @@ yy45:
 #ifdef DEBUG
 						printf("PARA(%s)\n", ctx->para.c);
 #endif
-						tag_arg(ctx PLS_DC);
+						tag_arg(ctx PLS_CC);
 						arg_start = YYCURSOR;
 						GO(STATE_NEXT_ARG);
 						NEXT;
@@ -626,7 +629,7 @@ yy54:
 #ifdef DEBUG
 						printf("PARA(%s)\n", ctx->para.c);
 #endif
-						tag_arg(ctx PLS_DC);
+						tag_arg(ctx PLS_CC);
 						arg_start = YYCURSOR;
 						GO(STATE_NEXT_ARG);
 						NEXT;
diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re
index 3025305c0c..c51f30c3ae 100644
--- a/ext/standard/url_scanner_ex.re
+++ b/ext/standard/url_scanner_ex.re
@@ -20,7 +20,10 @@
 
 #ifdef TRANS_SID
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -105,7 +108,7 @@ static char *check_tag_arg[] = {
 	NULL
 };
 
-static inline void tag_arg(url_adapt_state_t *ctx PLS_CC)
+static inline void tag_arg(url_adapt_state_t *ctx PLS_DC)
 {
 	char f = 0;
 	int i;
@@ -253,7 +256,7 @@ static void mainloop(url_adapt_state_t *ctx, smart_str *newstuff)
 #ifdef DEBUG
 						printf("PARA(%s)\n", ctx->para.c);
 #endif
-						tag_arg(ctx PLS_DC);
+						tag_arg(ctx PLS_CC);
 						arg_start = YYCURSOR;
 						GO(STATE_NEXT_ARG);
 						NEXT;
@@ -265,7 +268,7 @@ static void mainloop(url_adapt_state_t *ctx, smart_str *newstuff)
 #ifdef DEBUG
 						printf("PARA(%s)\n", ctx->para.c);
 #endif
-						tag_arg(ctx PLS_DC);
+						tag_arg(ctx PLS_CC);
 						arg_start = YYCURSOR;
 						GO(STATE_NEXT_ARG);
 						NEXT;