64bit changes

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@754 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache_acceptor.c b/varnish-cache/bin/varnishd/cache_acceptor.c
index a4ffbdcdc05247113a6bc21f440a406f8d692d50..dbd793d8da1f63a9e73314fb525fe013dbf949c2 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_acceptor.c
+++ b/varnish-cache/bin/varnishd/cache_acceptor.c
@@ -6,8 +6,8 @@
  * write the session pointer to a pipe which the event engine monitors.
  */
 
-#define ACCEPTOR_USE_POLL
-#undef ACCEPTOR_USE_KQUEUE
+#undef ACCEPTOR_USE_POLL
+#define ACCEPTOR_USE_KQUEUE
 
 #include <stdio.h>
 #include <errno.h>

diff --git a/varnish-cache/bin/varnishd/varnishd.c b/varnish-cache/bin/varnishd/varnishd.c
index 7069fe2cd74afe4fdf40d6c013d4fe35362ea325..fdb0f0b25956f240ed2168d5d1566ff40fb93259 100644 (file)
--- a/varnish-cache/bin/varnishd/varnishd.c
+++ b/varnish-cache/bin/varnishd/varnishd.c
@@ -63,8 +63,8 @@ setup_hash(const char *sflag)
        } else if (!cmp_hash(&hsl_slinger, sflag, p)) {
                hp = &hsl_slinger;
        } else {
-               fprintf(stderr, "Unknown hash method \"%*.*s\"\n",
-                       p - sflag, p - sflag, sflag);
+               fprintf(stderr, "Unknown hash method \"%.*s\"\n",
+                   (int)(p - sflag), sflag);
                exit (2);
        }
        heritage.hash = hp;
@@ -108,8 +108,8 @@ setup_storage(const char *sflag)
        } else if (!cmp_storage(&smf_stevedore, sflag, p)) {
                stp = &smf_stevedore;
        } else {
-               fprintf(stderr, "Unknown storage method \"%*.*s\"\n",
-                       p - sflag, p - sflag, sflag);
+               fprintf(stderr, "Unknown storage method \"%.*s\"\n",
+                   (int)(p - sflag), sflag);
                exit (2);
        }
        heritage.stevedore = malloc(sizeof *heritage.stevedore);

diff --git a/varnish-cache/lib/libvcl/vcc_compile.c b/varnish-cache/lib/libvcl/vcc_compile.c
index c75c662be4eaed16338eb230e607cacb2a997e1e..b5a4076555cbc4ac83c3e65fabcaf13969651033 100644 (file)
--- a/varnish-cache/lib/libvcl/vcc_compile.c
+++ b/varnish-cache/lib/libvcl/vcc_compile.c
@@ -420,7 +420,7 @@ HeaderVar(struct tokenlist *tl, struct token *t, struct var *vh)
        v->name = p;
        v->fmt = STRING;
        asprintf(&p, "VRT_GetHdr(sp, \"\\%03o%s:\")",
-           strlen(v->name + vh->len) + 1, v->name + vh->len);
+           (unsigned)(strlen(v->name + vh->len) + 1), v->name + vh->len);
        assert(p != NULL);
        v->rname = p;
        return (v);

diff --git a/varnish-cache/lib/libvcl/vcc_token.c b/varnish-cache/lib/libvcl/vcc_token.c
index b0314a930ad06eae595b1536996ccc95cb52035f..e4c4c049253f97a45ea264df24655c1bb3fad812 100644 (file)
--- a/varnish-cache/lib/libvcl/vcc_token.c
+++ b/varnish-cache/lib/libvcl/vcc_token.c
@@ -180,9 +180,8 @@ vcc_AddToken(struct tokenlist *tl, unsigned tok, const char *b, const char *e)
        TAILQ_INSERT_TAIL(&tl->tokens, t, list);
        tl->t = t;
        if (0) {
-               fprintf(stderr, "[%s %*.*s] ",
-                   vcl_tnames[tok],
-                   e - b, e - b, b);
+               fprintf(stderr, "[%s %.*s] ",
+                   vcl_tnames[tok],(int)(e - b), b);
                if (tok == EOI)
                        fprintf(stderr, "\n");
        }