From 243bedea9d0bff837d56fae223de2056e3d70f1a Mon Sep 17 00:00:00 2001 From: Kristaps Dzonsons Date: Tue, 22 Mar 2011 14:33:05 +0000 Subject: libmdoc.h and libman.h were including mdoc.h and man.h, respectively. Don't have them do that (includes in header files = faugh), and have individual files directly include these files. --- arch.c | 3 ++- att.c | 3 ++- lib.c | 3 ++- libman.h | 4 +--- libmdoc.h | 4 +--- man.c | 3 ++- man_argv.c | 4 ++-- man_hash.c | 3 ++- man_macro.c | 3 ++- man_validate.c | 3 ++- mdoc.c | 3 ++- mdoc_argv.c | 3 ++- mdoc_hash.c | 3 ++- mdoc_macro.c | 3 ++- mdoc_validate.c | 3 ++- msec.c | 3 ++- st.c | 3 ++- vol.c | 3 ++- 18 files changed, 34 insertions(+), 23 deletions(-) diff --git a/arch.c b/arch.c index c3d76340..e764bfe9 100644 --- a/arch.c +++ b/arch.c @@ -1,4 +1,4 @@ -/* $Id: arch.c,v 1.8 2010/06/19 20:46:27 kristaps Exp $ */ +/* $Id: arch.c,v 1.9 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -22,6 +22,7 @@ #include #include +#include "mdoc.h" #include "mandoc.h" #include "libmdoc.h" diff --git a/att.c b/att.c index cfd6b443..24d757dd 100644 --- a/att.c +++ b/att.c @@ -1,4 +1,4 @@ -/* $Id: att.c,v 1.8 2010/06/19 20:46:27 kristaps Exp $ */ +/* $Id: att.c,v 1.9 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -22,6 +22,7 @@ #include #include +#include "mdoc.h" #include "mandoc.h" #include "libmdoc.h" diff --git a/lib.c b/lib.c index bbf2aec8..7a18a5dd 100644 --- a/lib.c +++ b/lib.c @@ -1,4 +1,4 @@ -/* $Id: lib.c,v 1.8 2010/06/19 20:46:27 kristaps Exp $ */ +/* $Id: lib.c,v 1.9 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -22,6 +22,7 @@ #include #include +#include "mdoc.h" #include "mandoc.h" #include "libmdoc.h" diff --git a/libman.h b/libman.h index 3094cb8a..b9f6b7c6 100644 --- a/libman.h +++ b/libman.h @@ -1,4 +1,4 @@ -/* $Id: libman.h,v 1.47 2011/03/20 16:02:05 kristaps Exp $ */ +/* $Id: libman.h,v 1.48 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2009, 2010 Kristaps Dzonsons * @@ -17,8 +17,6 @@ #ifndef LIBMAN_H #define LIBMAN_H -#include "man.h" - enum man_next { MAN_NEXT_SIBLING = 0, MAN_NEXT_CHILD diff --git a/libmdoc.h b/libmdoc.h index e6d1583f..2a55eb37 100644 --- a/libmdoc.h +++ b/libmdoc.h @@ -1,4 +1,4 @@ -/* $Id: libmdoc.h,v 1.71 2011/03/22 14:28:48 kristaps Exp $ */ +/* $Id: libmdoc.h,v 1.72 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * @@ -17,8 +17,6 @@ #ifndef LIBMDOC_H #define LIBMDOC_H -#include "mdoc.h" - enum mdoc_next { MDOC_NEXT_SIBLING = 0, MDOC_NEXT_CHILD diff --git a/man.c b/man.c index fc5280a5..5bbaf2ba 100644 --- a/man.c +++ b/man.c @@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.104 2011/03/20 16:02:05 kristaps Exp $ */ +/* $Id: man.c,v 1.105 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * @@ -26,6 +26,7 @@ #include #include +#include "man.h" #include "mandoc.h" #include "libman.h" #include "libmandoc.h" diff --git a/man_argv.c b/man_argv.c index e783dca8..eb9d47f6 100644 --- a/man_argv.c +++ b/man_argv.c @@ -1,4 +1,4 @@ -/* $Id: man_argv.c,v 1.6 2011/03/20 16:02:05 kristaps Exp $ */ +/* $Id: man_argv.c,v 1.7 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2011 Ingo Schwarze * @@ -22,11 +22,11 @@ #include +#include "man.h" #include "mandoc.h" #include "libman.h" #include "libmandoc.h" - int man_args(struct man *m, int line, int *pos, char *buf, char **v) { diff --git a/man_hash.c b/man_hash.c index 6524f36e..c52640e8 100644 --- a/man_hash.c +++ b/man_hash.c @@ -1,4 +1,4 @@ -/* $Id: man_hash.c,v 1.23 2010/07/31 23:52:58 schwarze Exp $ */ +/* $Id: man_hash.c,v 1.24 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * @@ -26,6 +26,7 @@ #include #include +#include "man.h" #include "mandoc.h" #include "libman.h" diff --git a/man_macro.c b/man_macro.c index a8c31e88..273f48d0 100644 --- a/man_macro.c +++ b/man_macro.c @@ -1,4 +1,4 @@ -/* $Id: man_macro.c,v 1.57 2011/03/20 16:02:05 kristaps Exp $ */ +/* $Id: man_macro.c,v 1.58 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * @@ -23,6 +23,7 @@ #include #include +#include "man.h" #include "mandoc.h" #include "libmandoc.h" #include "libman.h" diff --git a/man_validate.c b/man_validate.c index 34f50fe4..e56415ba 100644 --- a/man_validate.c +++ b/man_validate.c @@ -1,4 +1,4 @@ -/* $Id: man_validate.c,v 1.65 2011/03/20 16:02:05 kristaps Exp $ */ +/* $Id: man_validate.c,v 1.66 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010 Ingo Schwarze @@ -30,6 +30,7 @@ #include #include +#include "man.h" #include "mandoc.h" #include "libman.h" #include "libmandoc.h" diff --git a/mdoc.c b/mdoc.c index d77d208c..b76c03a6 100644 --- a/mdoc.c +++ b/mdoc.c @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.186 2011/03/22 14:05:45 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.187 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010 Ingo Schwarze @@ -28,6 +28,7 @@ #include #include +#include "mdoc.h" #include "mandoc.h" #include "libmdoc.h" #include "libmandoc.h" diff --git a/mdoc_argv.c b/mdoc_argv.c index a98be67b..7750fd29 100644 --- a/mdoc_argv.c +++ b/mdoc_argv.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_argv.c,v 1.71 2011/03/22 14:28:48 kristaps Exp $ */ +/* $Id: mdoc_argv.c,v 1.72 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * @@ -26,6 +26,7 @@ #include #include +#include "mdoc.h" #include "mandoc.h" #include "libmdoc.h" #include "libmandoc.h" diff --git a/mdoc_hash.c b/mdoc_hash.c index 3bf29dfd..a1a03094 100644 --- a/mdoc_hash.c +++ b/mdoc_hash.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_hash.c,v 1.16 2010/06/19 20:46:28 kristaps Exp $ */ +/* $Id: mdoc_hash.c,v 1.17 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -27,6 +27,7 @@ #include #include +#include "mdoc.h" #include "mandoc.h" #include "libmdoc.h" diff --git a/mdoc_macro.c b/mdoc_macro.c index dfd14907..b334b4e4 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_macro.c,v 1.105 2011/03/22 14:05:45 kristaps Exp $ */ +/* $Id: mdoc_macro.c,v 1.106 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons * Copyright (c) 2010 Ingo Schwarze @@ -26,6 +26,7 @@ #include #include +#include "mdoc.h" #include "mandoc.h" #include "libmdoc.h" #include "libmandoc.h" diff --git a/mdoc_validate.c b/mdoc_validate.c index a2099594..269bd4dd 100644 --- a/mdoc_validate.c +++ b/mdoc_validate.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_validate.c,v 1.164 2011/03/20 16:02:05 kristaps Exp $ */ +/* $Id: mdoc_validate.c,v 1.165 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2011 Ingo Schwarze @@ -33,6 +33,7 @@ #include #include +#include "mdoc.h" #include "mandoc.h" #include "libmdoc.h" #include "libmandoc.h" diff --git a/msec.c b/msec.c index ba5e8d78..f51360e5 100644 --- a/msec.c +++ b/msec.c @@ -1,4 +1,4 @@ -/* $Id: msec.c,v 1.8 2010/05/17 22:11:42 kristaps Exp $ */ +/* $Id: msec.c,v 1.9 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -21,6 +21,7 @@ #include #include +#include "mdoc.h" #include "mandoc.h" #include "libmdoc.h" diff --git a/st.c b/st.c index 5c6798e5..70c21a26 100644 --- a/st.c +++ b/st.c @@ -1,4 +1,4 @@ -/* $Id: st.c,v 1.8 2010/06/19 20:46:28 kristaps Exp $ */ +/* $Id: st.c,v 1.9 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -22,6 +22,7 @@ #include #include +#include "mdoc.h" #include "mandoc.h" #include "libmdoc.h" diff --git a/vol.c b/vol.c index 144d363f..3ea7441a 100644 --- a/vol.c +++ b/vol.c @@ -1,4 +1,4 @@ -/* $Id: vol.c,v 1.8 2010/06/19 20:46:28 kristaps Exp $ */ +/* $Id: vol.c,v 1.9 2011/03/22 14:33:05 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -22,6 +22,7 @@ #include #include +#include "mdoc.h" #include "mandoc.h" #include "libmdoc.h" -- cgit v1.2.3