From b8bbb0e393e8a7bb62b91e7e64548de27276f9e0 Mon Sep 17 00:00:00 2001 From: Jeroen Nijhof Date: Sun, 16 Sep 2012 20:25:57 +0200 Subject: Rearrange header file include for libtac --- libtac/lib/acct_r.c | 1 - libtac/lib/acct_s.c | 1 - libtac/lib/attrib.c | 1 - libtac/lib/authen_r.c | 1 - libtac/lib/authen_s.c | 1 - libtac/lib/author_r.c | 1 - libtac/lib/author_s.c | 1 - libtac/lib/connect.c | 1 - libtac/lib/cont_s.c | 1 - libtac/lib/crypt.c | 1 - libtac/lib/hdr_check.c | 1 - libtac/lib/header.c | 1 - libtac/lib/magic.c | 5 ----- libtac/lib/magic.h | 5 ++--- libtac/lib/md5.h | 2 ++ libtac/lib/read_wait.c | 6 +++++- libtac/lib/xalloc.c | 2 +- libtac/lib/xalloc.h | 2 ++ 18 files changed, 12 insertions(+), 22 deletions(-) (limited to 'libtac/lib') diff --git a/libtac/lib/acct_r.c b/libtac/lib/acct_r.c index 45e1c5a..766f645 100644 --- a/libtac/lib/acct_r.c +++ b/libtac/lib/acct_r.c @@ -19,7 +19,6 @@ * See `CHANGES' file for revision history. */ -#include "tacplus.h" #include "xalloc.h" #include "libtac.h" #include "messages.h" diff --git a/libtac/lib/acct_s.c b/libtac/lib/acct_s.c index fe86cdb..200dd62 100644 --- a/libtac/lib/acct_s.c +++ b/libtac/lib/acct_s.c @@ -19,7 +19,6 @@ * See `CHANGES' file for revision history. */ -#include "tacplus.h" #include "libtac.h" #include "xalloc.h" diff --git a/libtac/lib/attrib.c b/libtac/lib/attrib.c index 9d71ee2..eb96b50 100644 --- a/libtac/lib/attrib.c +++ b/libtac/lib/attrib.c @@ -20,7 +20,6 @@ * See `CHANGES' file for revision history. */ -#include "tacplus.h" #include "libtac.h" #include "xalloc.h" diff --git a/libtac/lib/authen_r.c b/libtac/lib/authen_r.c index 566b747..dc6af33 100644 --- a/libtac/lib/authen_r.c +++ b/libtac/lib/authen_r.c @@ -19,7 +19,6 @@ * See `CHANGES' file for revision history. */ -#include "tacplus.h" #include "libtac.h" #include "messages.h" diff --git a/libtac/lib/authen_s.c b/libtac/lib/authen_s.c index 6a9a70c..8cb7cb9 100644 --- a/libtac/lib/authen_s.c +++ b/libtac/lib/authen_s.c @@ -19,7 +19,6 @@ * See `CHANGES' file for revision history. */ -#include "tacplus.h" #include "libtac.h" #include "xalloc.h" #include "md5.h" diff --git a/libtac/lib/author_r.c b/libtac/lib/author_r.c index 43531a2..bed9525 100644 --- a/libtac/lib/author_r.c +++ b/libtac/lib/author_r.c @@ -19,7 +19,6 @@ * See `CHANGES' file for revision history. */ -#include "tacplus.h" #include "xalloc.h" #include "libtac.h" #include "messages.h" diff --git a/libtac/lib/author_s.c b/libtac/lib/author_s.c index 489d8ee..56f1a97 100644 --- a/libtac/lib/author_s.c +++ b/libtac/lib/author_s.c @@ -19,7 +19,6 @@ * See `CHANGES' file for revision history. */ -#include "tacplus.h" #include "libtac.h" #include "xalloc.h" diff --git a/libtac/lib/connect.c b/libtac/lib/connect.c index 1494976..40a6d86 100644 --- a/libtac/lib/connect.c +++ b/libtac/lib/connect.c @@ -29,7 +29,6 @@ #include #endif -#include "tacplus.h" #include "libtac.h" /* Pointer to TACACS+ connection timeout */ diff --git a/libtac/lib/cont_s.c b/libtac/lib/cont_s.c index b155cdc..c4ae0bd 100644 --- a/libtac/lib/cont_s.c +++ b/libtac/lib/cont_s.c @@ -18,7 +18,6 @@ * See `CHANGES' file for revision history. */ -#include "tacplus.h" #include "libtac.h" #include "md5.h" diff --git a/libtac/lib/crypt.c b/libtac/lib/crypt.c index d06f4f7..5ecdbd6 100644 --- a/libtac/lib/crypt.c +++ b/libtac/lib/crypt.c @@ -19,7 +19,6 @@ * See `CHANGES' file for revision history. */ -#include "tacplus.h" #include "libtac.h" #include "xalloc.h" #include "md5.h" diff --git a/libtac/lib/hdr_check.c b/libtac/lib/hdr_check.c index 3766744..9ec7efd 100644 --- a/libtac/lib/hdr_check.c +++ b/libtac/lib/hdr_check.c @@ -19,7 +19,6 @@ * See `CHANGES' file for revision history. */ -#include "tacplus.h" #include "messages.h" #include "libtac.h" diff --git a/libtac/lib/header.c b/libtac/lib/header.c index 349c563..f361225 100644 --- a/libtac/lib/header.c +++ b/libtac/lib/header.c @@ -19,7 +19,6 @@ * See `CHANGES' file for revision history. */ -#include "tacplus.h" #include "libtac.h" #include "xalloc.h" #include "magic.h" diff --git a/libtac/lib/magic.c b/libtac/lib/magic.c index 89bf023..e813afc 100644 --- a/libtac/lib/magic.c +++ b/libtac/lib/magic.c @@ -24,11 +24,6 @@ #include #include -/* u_int32_t support for sun */ -#ifdef sun -typedef unsigned int u_int32_t; -#endif - #include "magic.h" #ifndef __linux__ diff --git a/libtac/lib/magic.h b/libtac/lib/magic.h index 44a8de9..c05331d 100644 --- a/libtac/lib/magic.h +++ b/libtac/lib/magic.h @@ -20,9 +20,8 @@ #ifndef _MAGIC_H #define _MAGIC_H -#ifndef __linux__ - #include "cdefs.h" -#endif + +#include "libtac.h" __BEGIN_DECLS void magic_init __P((void)); /* Initialize the magic number generator */ diff --git a/libtac/lib/md5.h b/libtac/lib/md5.h index a1cbfbd..00941c8 100644 --- a/libtac/lib/md5.h +++ b/libtac/lib/md5.h @@ -20,6 +20,8 @@ #ifndef __MD5_INCLUDE__ +#include "libtac.h" + /* typedef a 32-bit type */ typedef unsigned int UINT4; diff --git a/libtac/lib/read_wait.c b/libtac/lib/read_wait.c index e855ac9..e294c8f 100644 --- a/libtac/lib/read_wait.c +++ b/libtac/lib/read_wait.c @@ -23,9 +23,13 @@ #include #include -#include "tacplus.h" #include "libtac.h" +/* FIONREAD support for sun */ +#ifdef sun +#include +#endif + static int delta_msecs(struct timeval *newer, struct timeval *older) { long deltasecs, deltausecs; struct timeval now; diff --git a/libtac/lib/xalloc.c b/libtac/lib/xalloc.c index de6a5fb..ce34c44 100644 --- a/libtac/lib/xalloc.c +++ b/libtac/lib/xalloc.c @@ -20,7 +20,7 @@ * See `CHANGES' file for revision history. */ -#include "libtac.h" +#include "xalloc.h" void *xcalloc(size_t nmemb, size_t size) { register void *val = calloc(nmemb, size); diff --git a/libtac/lib/xalloc.h b/libtac/lib/xalloc.h index 79b12f9..70bc666 100644 --- a/libtac/lib/xalloc.h +++ b/libtac/lib/xalloc.h @@ -22,6 +22,8 @@ #ifndef _XALLOC_H #define _XALLOC_H +#include "libtac.h" + __BEGIN_DECLS extern void *xcalloc(size_t nmemb, size_t size); extern void *xrealloc(void *ptr, size_t size); -- cgit v1.2.3