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 8ae8a4d2171ef9319ee1bcc91a64c53cd3b3787e..ebf82926da072ec3e8e1594fc75db7e4d358049c 100644 (file)
--- 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 3025305c0c0f5273eb398dea0e78cb4cc2d26d19..c51f30c3ae4bc0aef164038deab22fedeca35b7e 100644 (file)
--- 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;