From 32b37f4983e41f5e01c3f8d4855f21bc38733229 Mon Sep 17 00:00:00 2001
From: glebius <glebius@FreeBSD.org>
Date: Thu, 5 May 2005 21:55:17 +0000
Subject: Always include alias.h before alias_local.h

---
 sys/netinet/libalias/alias.c         | 4 ++--
 sys/netinet/libalias/alias_cuseeme.c | 2 +-
 sys/netinet/libalias/alias_ftp.c     | 2 +-
 sys/netinet/libalias/alias_irc.c     | 2 +-
 sys/netinet/libalias/alias_nbt.c     | 1 +
 sys/netinet/libalias/alias_pptp.c    | 1 +
 sys/netinet/libalias/alias_proxy.c   | 4 ++--
 sys/netinet/libalias/alias_skinny.c  | 1 +
 sys/netinet/libalias/alias_smedia.c  | 2 +-
 9 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'sys/netinet/libalias')

diff --git a/sys/netinet/libalias/alias.c b/sys/netinet/libalias/alias.c
index 07ae799..0a6a8df 100644
--- a/sys/netinet/libalias/alias.c
+++ b/sys/netinet/libalias/alias.c
@@ -126,11 +126,11 @@ __FBSDID("$FreeBSD$");
 #include <netinet/udp.h>
 
 #ifdef _KERNEL
-#include <netinet/libalias/alias_local.h>
 #include <netinet/libalias/alias.h>
+#include <netinet/libalias/alias_local.h>
 #else
-#include "alias_local.h"
 #include "alias.h"
+#include "alias_local.h"
 #endif
 
 #define NETBIOS_NS_PORT_NUMBER 137
diff --git a/sys/netinet/libalias/alias_cuseeme.c b/sys/netinet/libalias/alias_cuseeme.c
index a6221c5..171a6f9 100644
--- a/sys/netinet/libalias/alias_cuseeme.c
+++ b/sys/netinet/libalias/alias_cuseeme.c
@@ -42,8 +42,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet/udp.h>
 
 #ifdef _KERNEL
-#include <netinet/libalias/alias_local.h>
 #include <netinet/libalias/alias.h>
+#include <netinet/libalias/alias_local.h>
 #else
 #include "alias_local.h"
 #endif
diff --git a/sys/netinet/libalias/alias_ftp.c b/sys/netinet/libalias/alias_ftp.c
index 823ee33..2de1d78 100644
--- a/sys/netinet/libalias/alias_ftp.c
+++ b/sys/netinet/libalias/alias_ftp.c
@@ -86,8 +86,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp.h>
 
 #ifdef _KERNEL
-#include <netinet/libalias/alias_local.h>
 #include <netinet/libalias/alias.h>
+#include <netinet/libalias/alias_local.h>
 #else
 #include "alias_local.h"
 #endif
diff --git a/sys/netinet/libalias/alias_irc.c b/sys/netinet/libalias/alias_irc.c
index 043678f..6d8bf3d 100644
--- a/sys/netinet/libalias/alias_irc.c
+++ b/sys/netinet/libalias/alias_irc.c
@@ -67,8 +67,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp.h>
 
 #ifdef _KERNEL
-#include <netinet/libalias/alias_local.h>
 #include <netinet/libalias/alias.h>
+#include <netinet/libalias/alias_local.h>
 #else
 #include "alias_local.h"
 #endif
diff --git a/sys/netinet/libalias/alias_nbt.c b/sys/netinet/libalias/alias_nbt.c
index 62328de..f03e1c4 100644
--- a/sys/netinet/libalias/alias_nbt.c
+++ b/sys/netinet/libalias/alias_nbt.c
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp.h>
 
 #ifdef _KERNEL
+#include <netinet/libalias/alias.h>
 #include <netinet/libalias/alias_local.h>
 #else
 #include "alias_local.h"
diff --git a/sys/netinet/libalias/alias_pptp.c b/sys/netinet/libalias/alias_pptp.c
index 473e44b..0ce69a4 100644
--- a/sys/netinet/libalias/alias_pptp.c
+++ b/sys/netinet/libalias/alias_pptp.c
@@ -79,6 +79,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp.h>
 
 #ifdef _KERNEL
+#include <netinet/libalias/alias.h>
 #include <netinet/libalias/alias_local.h>
 #else
 #include "alias_local.h"
diff --git a/sys/netinet/libalias/alias_proxy.c b/sys/netinet/libalias/alias_proxy.c
index f131589..f090157 100644
--- a/sys/netinet/libalias/alias_proxy.c
+++ b/sys/netinet/libalias/alias_proxy.c
@@ -79,11 +79,11 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp.h>
 
 #ifdef _KERNEL
-#include <netinet/libalias/alias_local.h>
 #include <netinet/libalias/alias.h>
+#include <netinet/libalias/alias_local.h>
 #else
-#include "alias_local.h"	/* Functions used by alias*.c */
 #include "alias.h"		/* Public API functions for libalias */
+#include "alias_local.h"	/* Functions used by alias*.c */
 #endif
 
 /*
diff --git a/sys/netinet/libalias/alias_skinny.c b/sys/netinet/libalias/alias_skinny.c
index a7c5c7d..4a155be 100644
--- a/sys/netinet/libalias/alias_skinny.c
+++ b/sys/netinet/libalias/alias_skinny.c
@@ -48,6 +48,7 @@
 #include <netinet/udp.h>
 
 #ifdef _KERNEL
+#include <netinet/libalias/alias.h>
 #include <netinet/libalias/alias_local.h>
 #else
 #include "alias_local.h"
diff --git a/sys/netinet/libalias/alias_smedia.c b/sys/netinet/libalias/alias_smedia.c
index 398e0ab..b713b86 100644
--- a/sys/netinet/libalias/alias_smedia.c
+++ b/sys/netinet/libalias/alias_smedia.c
@@ -114,8 +114,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet/udp.h>
 
 #ifdef _KERNEL
-#include <netinet/libalias/alias_local.h>
 #include <netinet/libalias/alias.h>
+#include <netinet/libalias/alias_local.h>
 #else
 #include "alias_local.h"
 #endif
-- 
cgit v1.1