make it build on amd64

svn:r2486

diff --git a/src/or/or.h b/src/or/or.h
index 5157f63a3abed40a83f60b80ce10c15d99336202..e58695c79f1a2ba46ac2635a10e79feb0cacefc0 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -488,8 +488,8 @@ struct connection_t {
   time_t timestamp_lastread; /**< When was the last time poll() said we could read? */
 
   buf_t *outbuf; /**< Buffer holding data to write over this connection. */
-  int outbuf_flushlen; /**< How much data should we try to flush from the
-                        * outbuf? */
+  size_t outbuf_flushlen; /**< How much data should we try to flush from the
+                           * outbuf? */
   time_t timestamp_lastwritten; /**< When was the last time poll() said we could write? */
 
   time_t timestamp_created; /**< When was this connection_t created? */
@@ -1193,7 +1193,7 @@ int dirserv_add_descriptor(const char **desc);
 int dirserv_load_from_directory_string(const char *dir);
 void dirserv_free_descriptors();
 void dirserv_remove_old_servers(int age);
-int dirserv_dump_directory_to_string(char *s, unsigned int maxlen,
+int dirserv_dump_directory_to_string(char *s, size_t maxlen,
                                      crypto_pk_env_t *private_key);
 void directory_set_dirty(void);
 size_t dirserv_get_directory(const char **cp, int compress);

diff --git a/src/or/test.c b/src/or/test.c
index 8599c31e5e59077ddc3b13defda81b5d86de033e..1bac5648c3232fcbf0b8128a240ea6cb8e4fdea3 100644 (file)
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -264,7 +264,7 @@ test_crypto()
   crypto_pk_env_t *pk1, *pk2;
   char *data1, *data2, *data3, *cp;
   int i, j, p, len;
-  int size;
+  size_t size;
 
   data1 = tor_malloc(1024);
   data2 = tor_malloc(1024);
@@ -1110,7 +1110,7 @@ void test_rend_fns()
   char address2[] = "aaaaaaaaaaaaaaaa.onion";
   rend_service_descriptor_t *d1, *d2;
   char *encoded;
-  int len;
+  size_t len;
   crypto_pk_env_t *pk1;
   time_t now;
   pk1 = crypto_new_pk_env();