commit cf0b07c2e5284325fb89f2c8ee3ad99f5ed02195 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 3 10:31:19 2018 -0400

Retire some unused (or nearly unused) macros. --- src/lib/cc/compat_compiler.h | 3 --- src/lib/net/nettypes.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/lib/cc/compat_compiler.h b/src/lib/cc/compat_compiler.h index c1621724d..a043ae809 100644 --- a/src/lib/cc/compat_compiler.h +++ b/src/lib/cc/compat_compiler.h @@ -189,14 +189,11 @@ #endif

#define U64_PRINTF_ARG(a) ((uint64_t)a) -#define U64_SCANF_ARG(a) (a) #define U64_LITERAL(n) UINT64_C(n) #define I64_PRINTF_ARG(a) ((int64_t)a) -#define I64_SCANF_ARG(a) (a) #define I64_LITERAL(n) INT64_C(n) #define U64_FORMAT "%"PRIu64 #define I64_FORMAT "%"PRId64 -#define INTPTR_T_FORMAT "%"PRIuPTR

/** Macro: yield a pointer to the field at position <b>off</b> within the * structure <b>st</b>. Example: diff --git a/src/lib/net/nettypes.h b/src/lib/net/nettypes.h index 9bae70d5f..f21237436 100644 --- a/src/lib/net/nettypes.h +++ b/src/lib/net/nettypes.h @@ -23,7 +23,7 @@ typedef int socklen_t; * any inadvertent checks for the socket being <= 0 or > 0 will probably * still work. */ #define tor_socket_t intptr_t -#define TOR_SOCKET_T_FORMAT INTPTR_T_FORMAT +#define TOR_SOCKET_T_FORMAT "%"PRIuPTR #define SOCKET_OK(s) ((SOCKET)(s) != INVALID_SOCKET) #define TOR_INVALID_SOCKET INVALID_SOCKET #else /* !(defined(_WIN32)) */