summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-05 15:04:18 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-05 15:04:18 -0400
commit459382986102dd1bd84bca24a0fddfe04efefd76 (patch)
tree2c0de91fc434a812acf9ce3bfccb93cb2f306fa2 /src/common
parent0adcfbc7c8b579ebfe4c16c86700e8b466fc9a56 (diff)
downloadtor-459382986102dd1bd84bca24a0fddfe04efefd76.tar.gz
tor-459382986102dd1bd84bca24a0fddfe04efefd76.zip
Remove util.h
Inline its contents (which were all includes) into or.h, and some of its contents into other places that didn't include or.h at all.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/include.am1
-rw-r--r--src/common/util.h52
2 files changed, 0 insertions, 53 deletions
diff --git a/src/common/include.am b/src/common/include.am
index de4ecbaeea..0a58a39ae0 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -52,7 +52,6 @@ COMMONHEADERS = \
src/common/procmon.h \
src/common/timers.h \
src/common/token_bucket.h \
- src/common/util.h \
src/common/workqueue.h
noinst_HEADERS+= $(COMMONHEADERS)
diff --git a/src/common/util.h b/src/common/util.h
deleted file mode 100644
index 55eec2b8c9..0000000000
--- a/src/common/util.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* Copyright (c) 2003-2004, Roger Dingledine
- * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2018, The Tor Project, Inc. */
-/* See LICENSE for licensing information */
-
-/**
- * \file util.h
- * \brief Headers for util.c
- **/
-
-#ifndef TOR_UTIL_H
-#define TOR_UTIL_H
-
-#include "orconfig.h"
-#include "lib/arch/bytes.h"
-#include "lib/cc/compat_compiler.h"
-#include "lib/cc/torint.h"
-#include "lib/ctime/di_ops.h"
-#include "lib/encoding/cstring.h"
-#include "lib/encoding/time_fmt.h"
-#include "lib/err/torerr.h"
-#include "lib/fs/dir.h"
-#include "lib/fs/files.h"
-#include "lib/fs/mmap.h"
-#include "lib/fs/path.h"
-#include "lib/fs/userdb.h"
-#include "lib/intmath/addsub.h"
-#include "lib/intmath/bits.h"
-#include "lib/intmath/cmp.h"
-#include "lib/intmath/logic.h"
-#include "lib/intmath/muldiv.h"
-#include "lib/log/escape.h"
-#include "lib/log/ratelim.h"
-#include "lib/log/util_bug.h"
-#include "lib/malloc/util_malloc.h"
-#include "lib/net/ipv4.h"
-#include "lib/net/ipv6.h"
-#include "lib/net/resolve.h"
-#include "lib/net/socket.h"
-#include "lib/string/compat_ctype.h"
-#include "lib/string/compat_string.h"
-#include "lib/string/parse_int.h"
-#include "lib/string/printf.h"
-#include "lib/string/scanf.h"
-#include "lib/string/util_string.h"
-#include "lib/testsupport/testsupport.h"
-#include "lib/thread/threads.h"
-#include "lib/time/compat_time.h"
-#include "lib/wallclock/approx_time.h"
-#include "lib/wallclock/timeval.h"
-
-#endif /* !defined(TOR_UTIL_H) */