diff options
| author | wlemb <wlemb> | 2004-02-20 07:24:19 +0000 |
|---|---|---|
| committer | wlemb <wlemb> | 2004-02-20 07:24:19 +0000 |
| commit | 070480fa13842074c15eaad937bf19e0da328b22 (patch) | |
| tree | c60d9768ee4d286361e3e6100c317407fd78c1d9 | |
| parent | cd1ec86bc5a464538e0773af976d362fc0945370 (diff) | |
| download | groff-070480fa13842074c15eaad937bf19e0da328b22.tar.gz | |
* src/roff/troff/div.cpp: Include nonposix.h after troff.h to
avoid warnings w.r.t. redefinition of P_tmpdir for some compilers.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/include/nonposix.h | 4 | ||||
| -rw-r--r-- | src/roff/troff/div.cpp | 4 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2004-02-19 Werner LEMBERG <wl@gnu.org> + + * 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 <wl@gnu.org> * 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 |