[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 05/05: Address build failure on macOS.
From: |
G. Branden Robinson |
Subject: |
[groff] 05/05: Address build failure on macOS. |
Date: |
Wed, 10 Feb 2021 15:15:40 -0500 (EST) |
gbranden pushed a commit to branch master
in repository groff.
commit 979f3f4266151c7681a68a40d2c4913842a7271d
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Feb 11 07:09:21 2021 +1100
Address build failure on macOS.
Follow the advice of the gnulib manual ("Changing your source for use
with gnulib") more scrupulously; include config.h in more files.
* src/libs/libgroff/assert.cpp [HAVE_CONFIG_H]: #include config.h using
angle brackets instead of quotation marks.
* src/libs/libgroff/curtime.cpp [HAVE_CONFIG_H]:
* src/libs/libgroff/device.cpp [HAVE_CONFIG_H]:
* src/libs/libgroff/errarg.cpp [HAVE_CONFIG_H]:
* src/libs/libgroff/error.cpp [HAVE_CONFIG_H]:
* src/libs/libgroff/fatal.cpp [HAVE_CONFIG_H]:
* src/libs/libgroff/string.cpp [HAVE_CONFIG_H]:
* src/libs/libgroff/strsave.cpp [HAVE_CONFIG_H]:
* src/preproc/eqn/other.cpp [HAVE_CONFIG_H]:
* src/preproc/eqn/text.cpp [HAVE_CONFIG_H]:
* src/preproc/pic/object.cpp [HAVE_CONFIG_H]: Do it.
Fixes <https://savannah.gnu.org/bugs/?60035>.
---
ChangeLog | 24 ++++++++++++++++++++++++
src/libs/libgroff/assert.cpp | 2 +-
src/libs/libgroff/curtime.cpp | 4 ++++
src/libs/libgroff/device.cpp | 4 ++++
src/libs/libgroff/errarg.cpp | 2 +-
src/libs/libgroff/error.cpp | 2 +-
src/libs/libgroff/fatal.cpp | 4 ++++
src/libs/libgroff/string.cpp | 4 ++++
src/libs/libgroff/strsave.cpp | 4 ++++
src/preproc/eqn/other.cpp | 4 ++++
src/preproc/eqn/text.cpp | 4 ++++
src/preproc/pic/object.cpp | 4 ++++
12 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dd52ec7..a3792b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,29 @@
2021-02-11 G. Branden Robinson <g.branden.robinson@gmail.com>
+ Address build failure on macOS.
+
+ Follow the advice of the gnulib manual ("Changing your source
+ for use with gnulib") more scrupulously; include config.h in
+ more files.
+
+ * src/libs/libgroff/assert.cpp [HAVE_CONFIG_H]: #include
+ config.h using angle brackets instead of quotation marks.
+
+ * src/libs/libgroff/curtime.cpp [HAVE_CONFIG_H]:
+ * src/libs/libgroff/device.cpp [HAVE_CONFIG_H]:
+ * src/libs/libgroff/errarg.cpp [HAVE_CONFIG_H]:
+ * src/libs/libgroff/error.cpp [HAVE_CONFIG_H]:
+ * src/libs/libgroff/fatal.cpp [HAVE_CONFIG_H]:
+ * src/libs/libgroff/string.cpp [HAVE_CONFIG_H]:
+ * src/libs/libgroff/strsave.cpp [HAVE_CONFIG_H]:
+ * src/preproc/eqn/other.cpp [HAVE_CONFIG_H]:
+ * src/preproc/eqn/text.cpp [HAVE_CONFIG_H]:
+ * src/preproc/pic/object.cpp [HAVE_CONFIG_H]: Do it.
+
+ Fixes <https://savannah.gnu.org/bugs/?60035>.
+
+2021-02-11 G. Branden Robinson <g.branden.robinson@gmail.com>
+
Add regression test for Savannah #60025.
* tmac/tests/doc_Mt-works.sh: Do it.
diff --git a/src/libs/libgroff/assert.cpp b/src/libs/libgroff/assert.cpp
index ed47e33..4b989e0 100644
--- a/src/libs/libgroff/assert.cpp
+++ b/src/libs/libgroff/assert.cpp
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public
License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
#include <stdio.h>
diff --git a/src/libs/libgroff/curtime.cpp b/src/libs/libgroff/curtime.cpp
index e778f8e..34dbc5c 100644
--- a/src/libs/libgroff/curtime.cpp
+++ b/src/libs/libgroff/curtime.cpp
@@ -15,6 +15,10 @@ for more details.
The GNU General Public License version 2 (GPL2) is available in the
internet at <http://www.gnu.org/licenses/gpl-2.0.txt>. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
diff --git a/src/libs/libgroff/device.cpp b/src/libs/libgroff/device.cpp
index 3fb9da6..33ffdca 100644
--- a/src/libs/libgroff/device.cpp
+++ b/src/libs/libgroff/device.cpp
@@ -17,6 +17,10 @@ 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/>. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h>
#include "device.h"
#include "defs.h"
diff --git a/src/libs/libgroff/errarg.cpp b/src/libs/libgroff/errarg.cpp
index 593e2a5..cfb9340 100644
--- a/src/libs/libgroff/errarg.cpp
+++ b/src/libs/libgroff/errarg.cpp
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public
License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
#include <stdio.h>
diff --git a/src/libs/libgroff/error.cpp b/src/libs/libgroff/error.cpp
index 7a2b6ad..0753149 100644
--- a/src/libs/libgroff/error.cpp
+++ b/src/libs/libgroff/error.cpp
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public
License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
#include <stdio.h>
diff --git a/src/libs/libgroff/fatal.cpp b/src/libs/libgroff/fatal.cpp
index bf547fb..1cbf3ef 100644
--- a/src/libs/libgroff/fatal.cpp
+++ b/src/libs/libgroff/fatal.cpp
@@ -16,6 +16,10 @@ 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/>. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h>
#define FATAL_ERROR_EXIT_CODE 3
diff --git a/src/libs/libgroff/string.cpp b/src/libs/libgroff/string.cpp
index f28b8bb..8eb50be 100644
--- a/src/libs/libgroff/string.cpp
+++ b/src/libs/libgroff/string.cpp
@@ -17,6 +17,10 @@ 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/>. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h>
#include "lib.h"
diff --git a/src/libs/libgroff/strsave.cpp b/src/libs/libgroff/strsave.cpp
index b890d6e..2b660a8 100644
--- a/src/libs/libgroff/strsave.cpp
+++ b/src/libs/libgroff/strsave.cpp
@@ -17,6 +17,10 @@ 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/>. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <string.h>
#include <stdlib.h>
diff --git a/src/preproc/eqn/other.cpp b/src/preproc/eqn/other.cpp
index e8d7918..aa1c2b7 100644
--- a/src/preproc/eqn/other.cpp
+++ b/src/preproc/eqn/other.cpp
@@ -17,6 +17,10 @@ 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/>. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h>
#include "eqn.h"
diff --git a/src/preproc/eqn/text.cpp b/src/preproc/eqn/text.cpp
index 94cd27e..6d518b7 100644
--- a/src/preproc/eqn/text.cpp
+++ b/src/preproc/eqn/text.cpp
@@ -17,6 +17,10 @@ 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/>. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <ctype.h>
#include <stdlib.h>
#include "eqn.h"
diff --git a/src/preproc/pic/object.cpp b/src/preproc/pic/object.cpp
index ee2c7db..ce0a7da 100644
--- a/src/preproc/pic/object.cpp
+++ b/src/preproc/pic/object.cpp
@@ -17,6 +17,10 @@ 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/>. */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdlib.h>
#include "pic.h"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 05/05: Address build failure on macOS.,
G. Branden Robinson <=