From 070480fa13842074c15eaad937bf19e0da328b22 Mon Sep 17 00:00:00 2001 From: wlemb Date: Fri, 20 Feb 2004 07:24:19 +0000 Subject: * src/roff/troff/div.cpp: Include nonposix.h after troff.h to avoid warnings w.r.t. redefinition of P_tmpdir for some compilers. --- ChangeLog | 5 +++++ src/include/nonposix.h | 4 +++- src/roff/troff/div.cpp | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 86b56e8b..1dae4d55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-02-19 Werner LEMBERG + + * src/roff/troff/div.cpp: Include nonposix.h after troff.h to + avoid warnings w.r.t. redefinition of P_tmpdir for some compilers. + 2004-02-18 Werner LEMBERG * font/devlj4/Makefile.sub (DEVFILES): Updated to contain all diff --git a/src/include/nonposix.h b/src/include/nonposix.h index a4f05c48..25a7b54e 100644 --- a/src/include/nonposix.h +++ b/src/include/nonposix.h @@ -18,7 +18,9 @@ with groff; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* This header file compartmentalize all idiosyncrasies of non-Posix - systems, such as MS-DOS, MS-Windows, etc. */ + systems, such as MS-DOS, MS-Windows, etc. It should be loaded after + the system headers like stdio.h to protect against warnings and error + messages w.r.t. redefining macros. */ #if defined _MSC_VER # ifndef _WIN32 diff --git a/src/roff/troff/div.cpp b/src/roff/troff/div.cpp index c94f4eb4..084d0b03 100644 --- a/src/roff/troff/div.cpp +++ b/src/roff/troff/div.cpp @@ -22,8 +22,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // diversions -#include "nonposix.h" - #include "troff.h" #include "dictionary.h" #include "hvunits.h" @@ -34,6 +32,8 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "div.h" #include "reg.h" +#include "nonposix.h" + int exit_started = 0; // the exit process has started int done_end_macro = 0; // the end macro (if any) has finished int seen_last_page_ejector = 0; // seen the LAST_PAGE_EJECTOR cookie -- cgit v1.2.1