Merge branch 'master' into lukeh/moonshot

2011-03-22 17:14:33 +11:00
parent 0fbfe9b38e 46444695f6
commit 4362ebe02a
1 changed files with 3 additions and 4 deletions
--- a/lib/ipc/hi_locl.h
+++ b/lib/ipc/hi_locl.h
@@ -36,7 +36,10 @@
 #include "config.h"

 #include <sys/types.h>
+#include <sys/socket.h>
+#ifdef HAVE_SYS_UN_H
 #include <sys/un.h>
+#endif

 #include <sys/poll.h>

@@ -53,10 +56,6 @@
 #include <krb5-types.h>
 #include <asn1-common.h>

-#ifdef HAVE_SYS_UN_H
-#include <sys/un.h>
-#endif
-
 #include <heimbase.h>
 #include <base64.h>