summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-22 11:46:44 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-22 11:46:44 -0400
commit7a93ce8f6382a2fe8687e7e42dc398e08480c901 (patch)
tree9e2e71259c81182851a237fac8a9c484e4320f68
parent79f73ab330c0e643ba1ec2eb0633f0f80525a083 (diff)
downloadtor-7a93ce8f6382a2fe8687e7e42dc398e08480c901.tar.gz
tor-7a93ce8f6382a2fe8687e7e42dc398e08480c901.zip
Update .gitignore and .may_include files
-rw-r--r--.gitignore4
-rw-r--r--src/common/.may_include1
-rw-r--r--src/lib/log/.may_include2
-rw-r--r--src/lib/wallclock/.may_include2
4 files changed, 8 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index f141fee176..025d7202d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -173,10 +173,14 @@ uptime-*.json
/src/lib/libtor-ctime-testing.a
/src/lib/libtor-err.a
/src/lib/libtor-err-testing.a
+/src/lib/libtor-fdio.a
+/src/lib/libtor-fdio-testing.a
/src/lib/libtor-intmath.a
/src/lib/libtor-intmath-testing.a
/src/lib/libtor-lock.a
/src/lib/libtor-lock-testing.a
+/src/lib/libtor-log.a
+/src/lib/libtor-log-testing.a
/src/lib/libtor-malloc.a
/src/lib/libtor-malloc-testing.a
/src/lib/libtor-string.a
diff --git a/src/common/.may_include b/src/common/.may_include
index 484b57e100..fab9ad0da8 100644
--- a/src/common/.may_include
+++ b/src/common/.may_include
@@ -5,7 +5,6 @@ lib/*/*.h
# XXXX These all belong somewhere else
ht.h
linux_syscalls.inc
-micro-revision.i
siphash.h
src/ext/timeouts/timeout.c
tor_queue.h
diff --git a/src/lib/log/.may_include b/src/lib/log/.may_include
index 4f6244c2d3..36a164cce0 100644
--- a/src/lib/log/.may_include
+++ b/src/lib/log/.may_include
@@ -3,7 +3,9 @@ orconfig.h
lib/cc/*.h
lib/container/smartlist.h
lib/err/*.h
+lib/fdio/*.h
lib/intmath/*.h
+lib/lock/*.h
lib/log/*.h
lib/malloc/*.h
lib/string/*.h
diff --git a/src/lib/wallclock/.may_include b/src/lib/wallclock/.may_include
index 686d9196fd..dc010da063 100644
--- a/src/lib/wallclock/.may_include
+++ b/src/lib/wallclock/.may_include
@@ -1,4 +1,6 @@
orconfig.h
+lib/cc/*.h
lib/err/*.h
lib/wallclock/*.h
+lib/string/*.h
lib/testsupport/*.h