diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-01 15:29:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-01 15:29:05 -0400 |
| commit | aaa31290431ea2cd1d1e8498dbe271eb53d2389d (patch) | |
| tree | d7ff38ffee26c5ab4571f089e8cf06d9e687a14c /src/common/util.h | |
| parent | 738a8c655a1f8067b330b132164fa8879ef102c3 (diff) | |
| parent | 36e201dffc5d57d92113e1e68ad4b6a0a7b3471e (diff) | |
| download | tor-aaa31290431ea2cd1d1e8498dbe271eb53d2389d.tar.gz tor-aaa31290431ea2cd1d1e8498dbe271eb53d2389d.zip | |
Merge remote-tracking branch 'dgoulet/ticket16943_029_05-squashed'
Trivial Conflicts:
src/or/or.h
src/or/routerparse.c
Diffstat (limited to 'src/common/util.h')
| -rw-r--r-- | src/common/util.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/util.h b/src/common/util.h index 44f510cef7..0d48eac1ad 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -61,6 +61,8 @@ void *tor_memdup_(const void *mem, size_t len DMALLOC_PARAMS) void *tor_memdup_nulterm_(const void *mem, size_t len DMALLOC_PARAMS) ATTR_MALLOC ATTR_NONNULL((1)); void tor_free_(void *mem); +uint64_t tor_htonll(uint64_t a); +uint64_t tor_ntohll(uint64_t a); #ifdef USE_DMALLOC extern int dmalloc_free(const char *file, const int line, void *pnt, const int func_id); |