From b8bbb0e393e8a7bb62b91e7e64548de27276f9e0 Mon Sep 17 00:00:00 2001
From: Jeroen Nijhof <jeroen@jeroennijhof.nl>
Date: Sun, 16 Sep 2012 20:25:57 +0200
Subject: Rearrange header file include for libtac

---
 libtac/include/libtac.h  | 9 +++++++--
 libtac/include/tacplus.h | 7 -------
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'libtac/include')

diff --git a/libtac/include/libtac.h b/libtac/include/libtac.h
index 5b85eac..6ede892 100644
--- a/libtac/include/libtac.h
+++ b/libtac/include/libtac.h
@@ -22,8 +22,6 @@
 #ifndef _LIB_TAC_H
 #define _LIB_TAC_H
 
-#include "tacplus.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -38,6 +36,13 @@ extern "C" {
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <unistd.h>
+#include <sys/types.h>
+#ifdef __linux__
+#include <sys/cdefs.h>
+#else
+#include "cdefs.h"
+#endif
+#include "tacplus.h"
 
 #if defined(DEBUGTAC) && !defined(TACDEBUG)
 #define TACDEBUG(x) syslog x;
diff --git a/libtac/include/tacplus.h b/libtac/include/tacplus.h
index 8f4ff6d..90d7c8b 100644
--- a/libtac/include/tacplus.h
+++ b/libtac/include/tacplus.h
@@ -22,13 +22,6 @@
 #ifndef _TACPLUS_H
 #define _TACPLUS_H
 
-#include <sys/types.h>
-#ifdef sun
-    #include "cdefs.h"
-#else
-    #include <sys/cdefs.h>
-#endif
-
 /* All tacacs+ packets have the same header format */
 struct tac_plus_pak_hdr {
     u_char version;
-- 
cgit v1.2.3