summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2006-12-06 13:09:32 +0000
committerMatt Johnston <matt@ucc.asn.au>2006-12-06 13:09:32 +0000
commit7b780efb42e3d9b369b4f00421fba1fc21ec2a22 (patch)
tree60a902968780ab9101d448fc553c40cbeab00c0e
parent7eee3ceb7042dcdb7373373afaee8bfc0fe7c52f (diff)
- Include netinet/in.h before arpa/inet.h for FreeBSD
- Update Copyright year --HG-- extra : convert_revision : 182c2d8dbd5321ef4d1df8758936f4dc7127015f
-rw-r--r--LICENSE2
-rw-r--r--includes.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/LICENSE b/LICENSE
index e0a11ac..ec93fa1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -8,7 +8,7 @@ The majority of code is written by Matt Johnston, under the license below.
Portions of the client-mode work are (c) 2004 Mihnea Stoenescu, under the
same license:
-Copyright (c) 2002-2004 Matt Johnston
+Copyright (c) 2002-2006 Matt Johnston
Portions copyright (c) 2004 Mihnea Stoenescu
All rights reserved.
diff --git a/includes.h b/includes.h
index 06c9692..da974cc 100644
--- a/includes.h
+++ b/includes.h
@@ -72,12 +72,12 @@
#include <lastlog.h>
#endif
-#include <arpa/inet.h>
-
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
+#include <arpa/inet.h>
+
/* netbsd 1.6 needs this to be included before netinet/ip.h for some
* undocumented reason */
#ifdef HAVE_NETINET_IN_SYSTM_H