Merge from HEAD

diff --git a/ext/standard/url_scanner_ex.c b/ext/standard/url_scanner_ex.c
index e2cdda67c75bb1fa46d21bdc9bb99f379f42168f..35b0e9e435581eac65045f1c6a8aed712f87bca1 100644 (file)
--- a/ext/standard/url_scanner_ex.c
+++ b/ext/standard/url_scanner_ex.c
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.5 on Mon Dec  4 13:26:39 2000 */
+/* Generated by re2c 0.5 on Tue Dec  5 11:55:45 2000 */
 #line 1 "/home/sas/src/php4/ext/standard/url_scanner_ex.re"
 /*
   +----------------------------------------------------------------------+
@@ -163,8 +163,8 @@ enum {
 #define YYMARKER q
 #define STATE ctx->state
 
-#define STD_PARA url_adapt_state_ex_t *ctx, char *start, char *YYCURSOR
-#define STD_ARGS ctx, start, xp
+#define STD_PARA url_adapt_state_ex_t *ctx, char *start, char *YYCURSOR PLS_DC
+#define STD_ARGS ctx, start, xp PLS_CC
 
 static inline void passthru(STD_PARA) 
 {

diff --git a/ext/standard/url_scanner_ex.re b/ext/standard/url_scanner_ex.re
index 40ba4fb0fb76baa10f33ded7b07fa9feb8c263c1..f18406eb5de0db5da0bf8c21bd397c63d6d44824 100644 (file)
--- a/ext/standard/url_scanner_ex.re
+++ b/ext/standard/url_scanner_ex.re
@@ -161,8 +161,8 @@ enum {
 #define YYMARKER q
 #define STATE ctx->state
 
-#define STD_PARA url_adapt_state_ex_t *ctx, char *start, char *YYCURSOR
-#define STD_ARGS ctx, start, xp
+#define STD_PARA url_adapt_state_ex_t *ctx, char *start, char *YYCURSOR PLS_DC
+#define STD_ARGS ctx, start, xp PLS_CC
 
 static inline void passthru(STD_PARA) 
 {