diff options
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | ifdata.c | 4 | ||||
| -rw-r--r-- | parallel.c | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..5d42584 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +debian/changelog merge=dpkg-mergechangelogs diff --git a/debian/changelog b/debian/changelog index 7559ffb..cec92a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +moreutils (0.50) UNRELEASED; urgency=low + + * Fix build on Hurd. Closes: #716653 + (Thanks, Pino Toscano) + + -- Joey Hess <joeyh@debian.org> Thu, 11 Jul 2013 10:55:52 -0400 + moreutils (0.49) unstable; urgency=low * ts: Fix timezone used with -i @@ -14,6 +14,10 @@ #include <net/if.h> #endif +#if defined(__GNU__) + #include <net/if.h> +#endif + #include <netinet/in.h> #include <errno.h> #include <fcntl.h> @@ -32,7 +32,7 @@ #include <sys/wait.h> #include <unistd.h> -#if defined(__FreeBSD_kernel__) +#if !defined(WEXITED) #define WEXITED 0 #endif |