[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 01/01: Fix previous commit.
From: |
Werner LEMBERG |
Subject: |
[groff] 01/01: Fix previous commit. |
Date: |
Sat, 29 Nov 2014 14:17:00 +0000 |
wl pushed a commit to branch master
in repository groff.
commit d055091bfd7a3e5f873f9cca220040cb02980629
Author: Werner Lemberg <address@hidden>
Date: Sat Nov 29 15:16:41 2014 +0100
Fix previous commit.
We forgot to test whether the patch works if compiling from
scratch...
Problem reported by Bertrand Garrigues
<address@hidden>.
* src/include/lib.h (interpret_lf_args, normalize_for_lf): Move
declarations to...
* src/include/lf.h: This new file.
* src/libs/libgroff/lf.cpp, src/preproc/pic/pic.h,
src/preproc/preconv/preconv.cpp, src/preproc/refer/refer.h,
src/preproc/soelim/soelim.cpp, src/preproc/tbl/table.h: Include
`lf.h'.
Make `lib.h' the first included header file.
* src/preproc/eqn/eqn.h: Don't include `stringclass.h'.
* src/preproc/eqn/main.cpp: Include `stringclass.h' and `lf.h'.
* src/roff/groff/groff.cpp: Make `lib.h' the first included header
file.
---
ChangeLog | 26 ++++++++++++++++++++++++++
src/include/lf.h | 21 +++++++++++++++++++++
src/include/lib.h | 3 ---
src/libs/libgroff/lf.cpp | 3 ++-
src/preproc/eqn/eqn.h | 1 -
src/preproc/eqn/main.cpp | 2 ++
src/preproc/pic/pic.h | 3 ++-
src/preproc/preconv/preconv.cpp | 3 ++-
src/preproc/refer/refer.h | 3 ++-
src/preproc/soelim/soelim.cpp | 3 ++-
src/preproc/tbl/table.h | 3 ++-
src/roff/groff/groff.cpp | 2 +-
12 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 36c0645..0ef85a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2014-11-29 Werner LEMBERG <address@hidden>
+
+ Fix previous commit.
+
+ We forgot to test whether the patch works if compiling from
+ scratch...
+
+ Problem reported by Bertrand Garrigues
+ <address@hidden>.
+
+ * src/include/lib.h (interpret_lf_args, normalize_for_lf): Move
+ declarations to...
+ * src/include/lf.h: This new file.
+
+ * src/libs/libgroff/lf.cpp, src/preproc/pic/pic.h,
+ src/preproc/preconv/preconv.cpp, src/preproc/refer/refer.h,
+ src/preproc/soelim/soelim.cpp, src/preproc/tbl/table.h: Include
+ `lf.h'.
+ Make `lib.h' the first included header file.
+
+ * src/preproc/eqn/eqn.h: Don't include `stringclass.h'.
+ * src/preproc/eqn/main.cpp: Include `stringclass.h' and `lf.h'.
+
+ * src/roff/groff/groff.cpp: Make `lib.h' the first included header
+ file.
+
2014-11-10 Eli Zaretskii <address@hidden>
Improve native Windows port.
diff --git a/src/include/lf.h b/src/include/lf.h
new file mode 100644
index 0000000..8f04408
--- /dev/null
+++ b/src/include/lf.h
@@ -0,0 +1,21 @@
+// -*- C++ -*-
+/* Copyright (C) 2014 Free Software Foundation, Inc.
+ Written by Werner Lemberg (address@hidden)
+
+This file is part of groff.
+
+groff is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+groff is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+int interpret_lf_args(const char *p);
+void normalize_for_lf (string &fn);
diff --git a/src/include/lib.h b/src/include/lib.h
index 005369e..1457fb9 100644
--- a/src/include/lib.h
+++ b/src/include/lib.h
@@ -98,9 +98,6 @@ extern "C" { int pclose (FILE *); }
size_t file_name_max(const char *fname);
size_t path_name_max();
-int interpret_lf_args(const char *p);
-void normalize_for_lf (string &fn);
-
extern char invalid_char_table[];
inline int invalid_input_char(int c)
diff --git a/src/libs/libgroff/lf.cpp b/src/libs/libgroff/lf.cpp
index 5d094b5..1510c12 100644
--- a/src/libs/libgroff/lf.cpp
+++ b/src/libs/libgroff/lf.cpp
@@ -19,9 +19,10 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include <ctype.h>
-#include "stringclass.h"
#include "lib.h"
#include "cset.h"
+#include "stringclass.h"
+#include "lf.h"
extern void change_filename(const char *);
extern void change_lineno(int);
diff --git a/src/preproc/eqn/eqn.h b/src/preproc/eqn/eqn.h
index 5904575..ed2d420 100644
--- a/src/preproc/eqn/eqn.h
+++ b/src/preproc/eqn/eqn.h
@@ -17,7 +17,6 @@ for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "stringclass.h"
#include "lib.h"
#include <assert.h>
diff --git a/src/preproc/eqn/main.cpp b/src/preproc/eqn/main.cpp
index 0b6f0e2..0eb1535 100644
--- a/src/preproc/eqn/main.cpp
+++ b/src/preproc/eqn/main.cpp
@@ -18,12 +18,14 @@ You should have received a copy of the GNU General Public
License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "eqn.h"
+#include "stringclass.h"
#include "device.h"
#include "searchpath.h"
#include "macropath.h"
#include "htmlhint.h"
#include "pbox.h"
#include "ctype.h"
+#include "lf.h"
#define STARTUP_FILE "eqnrc"
diff --git a/src/preproc/pic/pic.h b/src/preproc/pic/pic.h
index 7da9169..22e1f43 100644
--- a/src/preproc/pic/pic.h
+++ b/src/preproc/pic/pic.h
@@ -17,7 +17,6 @@ for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "stringclass.h"
#include "lib.h"
#include <math.h>
@@ -50,6 +49,8 @@ extern "C" {
#include "assert.h"
#include "cset.h"
+#include "stringclass.h"
+#include "lf.h"
#include "errarg.h"
#include "error.h"
#include "position.h"
diff --git a/src/preproc/preconv/preconv.cpp b/src/preproc/preconv/preconv.cpp
index b3fdba0..6e65a4b 100644
--- a/src/preproc/preconv/preconv.cpp
+++ b/src/preproc/preconv/preconv.cpp
@@ -17,7 +17,6 @@ for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "stringclass.h"
#include "lib.h"
#include <assert.h>
@@ -27,6 +26,8 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "error.h"
#include "localcharset.h"
#include "nonposix.h"
+#include "stringclass.h"
+#include "lf.h"
#include <locale.h>
diff --git a/src/preproc/refer/refer.h b/src/preproc/refer/refer.h
index 9b97617..93e3171 100644
--- a/src/preproc/refer/refer.h
+++ b/src/preproc/refer/refer.h
@@ -17,7 +17,6 @@ for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "stringclass.h"
#include "lib.h"
#include <stdlib.h>
@@ -26,8 +25,10 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "errarg.h"
#include "error.h"
+#include "stringclass.h"
#include "cset.h"
#include "cmap.h"
+#include "lf.h"
#include "defs.h"
diff --git a/src/preproc/soelim/soelim.cpp b/src/preproc/soelim/soelim.cpp
index a294a90..9b315c3 100644
--- a/src/preproc/soelim/soelim.cpp
+++ b/src/preproc/soelim/soelim.cpp
@@ -17,7 +17,6 @@ for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "stringclass.h"
#include "lib.h"
#include <ctype.h>
@@ -26,8 +25,10 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include <errno.h>
#include "errarg.h"
#include "error.h"
+#include "stringclass.h"
#include "nonposix.h"
#include "searchpath.h"
+#include "lf.h"
// The include search path initially contains only the current directory.
static search_path include_search_path(0, 0, 0, 1);
diff --git a/src/preproc/tbl/table.h b/src/preproc/tbl/table.h
index ca2f9a8..abb31c5 100644
--- a/src/preproc/tbl/table.h
+++ b/src/preproc/tbl/table.h
@@ -17,7 +17,6 @@ for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#include "stringclass.h"
#include "lib.h"
#include <stdlib.h>
@@ -27,8 +26,10 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "cset.h"
#include "cmap.h"
+#include "stringclass.h"
#include "errarg.h"
#include "error.h"
+#include "lf.h"
// PREFIX and PREFIX_CHAR must be the same.
#define PREFIX "3"
diff --git a/src/roff/groff/groff.cpp b/src/roff/groff/groff.cpp
index 2eff984..cd6e293 100644
--- a/src/roff/groff/groff.cpp
+++ b/src/roff/groff/groff.cpp
@@ -19,7 +19,6 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
// A front end for groff.
-#include "stringclass.h"
#include "lib.h"
#include <stdlib.h>
@@ -29,6 +28,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "assert.h"
#include "errarg.h"
#include "error.h"
+#include "stringclass.h"
#include "cset.h"
#include "font.h"
#include "device.h"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 01/01: Fix previous commit.,
Werner LEMBERG <=