diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-12-22 20:38:33 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-12-22 20:38:33 -0500 |
| commit | ff3e90070fd21788ac2c1c9116f18c9b888c750a (patch) | |
| tree | 15c5768dbbcc75499c617a1db9597bdcbba2c3da | |
| parent | b9596b8fdf5006d650bba0109e5614b5a387dbdf (diff) | |
| parent | d0c209c51d856ee78cca1e4ee337d10155a93916 (diff) | |
| download | tor-ff3e90070fd21788ac2c1c9116f18c9b888c750a.tar.gz tor-ff3e90070fd21788ac2c1c9116f18c9b888c750a.zip | |
Merge branch 'maint-0.2.7'
| -rw-r--r-- | changes/bug17923 | 4 | ||||
| -rw-r--r-- | configure.ac | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug17923 b/changes/bug17923 new file mode 100644 index 0000000000..48026a5c2f --- /dev/null +++ b/changes/bug17923 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Add an #endif to configure.ac so that we correctly detect + the presence of in6_addr.s6_addr32. Fixes bug 17923; bugfix on + 0.2.0.13-alpha. diff --git a/configure.ac b/configure.ac index 25edbaf1d9..ad86f764de 100644 --- a/configure.ac +++ b/configure.ac @@ -1155,7 +1155,6 @@ AC_CHECK_MEMBERS([struct in6_addr.s6_addr32, struct in6_addr.s6_addr16, struct s #include <winsock2.h> #include <ws2tcpip.h> #endif -#endif ]) AC_CHECK_TYPES([rlim_t], , , |