diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-02-25 16:22:29 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-02-25 16:22:29 -0500 |
| commit | 2ab3389ed64827fee4e756e5a3ffc5ff579b1a05 (patch) | |
| tree | 221c82d3a06aa60c1e156d972e120784d95b62a4 /src/common | |
| parent | 8b93dacbcfbca7b4653f7a9b727bdc209aff1e7c (diff) | |
| parent | 215930a7de3682e311badc94edc5be761b61e0c0 (diff) | |
| download | tor-2ab3389ed64827fee4e756e5a3ffc5ff579b1a05.tar.gz tor-2ab3389ed64827fee4e756e5a3ffc5ff579b1a05.zip | |
Merge remote branch 'mikeperry/consensus-bw-weights5-merge'
Conflicts:
ChangeLog
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/compat.c | 1 | ||||
| -rw-r--r-- | src/common/compat.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index 406d74eb25..33e32d433c 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1789,7 +1789,6 @@ spawn_exit(void) * call _exit, not exit, from child processes. */ _exit(0); #endif - } /** Set *timeval to the current time of day. On error, log and terminate. diff --git a/src/common/compat.h b/src/common/compat.h index 554ae8919f..60fb1cb652 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -206,8 +206,10 @@ size_t strlcpy(char *dst, const char *src, size_t siz) ATTR_NONNULL((1,2)); /** The formatting string used to put a uint64_t value in a printf() or * scanf() function. See also U64_PRINTF_ARG and U64_SCANF_ARG. */ #define U64_FORMAT "%I64u" +#define I64_FORMAT "%I64d" #else #define U64_FORMAT "%llu" +#define I64_FORMAT "%lld" #endif /** Represents an mmaped file. Allocated via tor_mmap_file; freed with |