64bit changes

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@754 d4fa192b-c00b-0410-8231-f00ffab90ce4

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>

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);

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);

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");
 	}