[tor-commits] [tor/master] MSVC build issue: make 'const' in declaration match 'const' in definition

[nickm@xxxxxxxxxxxxxx]

commit 43e15300bad6dd2618f331d51a1b3f83c2326d4e
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon May 14 13:05:00 2012 -0400

    MSVC build issue: make 'const' in declaration match 'const' in definition
    
    MSVC warns if you declare a function as having a "int foo" argument
    and then implement it with a "const int foo" argument, even though
    the latter "const" is not a part of the function's interface.
---
 src/or/connection_edge.h |    3 ++-
 src/or/rephist.h         |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h
index 47c9c45..f6db4b4 100644
--- a/src/or/connection_edge.h
+++ b/src/or/connection_edge.h
@@ -79,7 +79,8 @@ int addressmap_have_mapping(const char *address, int update_timeout);
 
 void addressmap_register(const char *address, char *new_address,
                          time_t expires, addressmap_entry_source_t source,
-                         int address_wildcard, int new_address_wildcard);
+                         const int address_wildcard,
+                         const int new_address_wildcard);
 int parse_virtual_addr_network(const char *val, int validate_only,
                                char **msg);
 int client_dns_incr_failures(const char *address);
diff --git a/src/or/rephist.h b/src/or/rephist.h
index 0a3e46a..6b05fe9 100644
--- a/src/or/rephist.h
+++ b/src/or/rephist.h
@@ -34,7 +34,7 @@ int rep_hist_load_state(or_state_t *state, char **err);
 void rep_history_clean(time_t before);
 
 void rep_hist_note_router_reachable(const char *id, const tor_addr_t *at_addr,
-                                    uint16_t at_port, time_t when);
+                                    const uint16_t at_port, time_t when);
 void rep_hist_note_router_unreachable(const char *id, time_t when);
 int rep_hist_record_mtbf_data(time_t now, int missing_means_down);
 int rep_hist_load_mtbf_data(time_t now);



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits