summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-01-02 16:15:39 -0500
committerNick Mathewson <nickm@torproject.org>2019-01-02 16:15:39 -0500
commit3e7f13a4ef6ff96617f26f434efa529bbf17f9ef (patch)
tree6d3a9436ceea191502a67ffb3d0837e9d1bd64e6
parenteaaeaf7933e90132bbdfac6b9ecd3b2535a0995a (diff)
parent98755cbddf64860efce6ab357f119b8d7e769a1b (diff)
downloadtor-3e7f13a4ef6ff96617f26f434efa529bbf17f9ef.tar.gz
tor-3e7f13a4ef6ff96617f26f434efa529bbf17f9ef.zip
Merge branch 'maint-0.3.5'
-rw-r--r--changes/bug289743
-rw-r--r--src/lib/fs/freespace.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug28974 b/changes/bug28974
new file mode 100644
index 0000000000..2d74f5674f
--- /dev/null
+++ b/changes/bug28974
@@ -0,0 +1,3 @@
+ o Minor bugfixes (compilation):
+ - Fix compilation for Android by adding a missing header to
+ freespace.c. Fixes bug 28974; bugfix on 0.3.5.1-alpha.
diff --git a/src/lib/fs/freespace.c b/src/lib/fs/freespace.c
index 2dbba3c5f8..c18b1e0234 100644
--- a/src/lib/fs/freespace.c
+++ b/src/lib/fs/freespace.c
@@ -19,6 +19,7 @@
#include <windows.h>
#endif
+#include <errno.h>
#include <string.h>
/** Return the amount of free disk space we have permission to use, in