Browse Source

Merge branch 'maint-0.2.7'

Nick Mathewson 8 years ago
parent
commit
ff3e90070f
2 changed files with 4 additions and 1 deletions
  1. 4 0
      changes/bug17923
  2. 0 1
      configure.ac

+ 4 - 0
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.

+ 0 - 1
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], , ,