gbranden pushed a commit to branch master
in repository groff.
commit c7ed976bccf598cce0a46512ff06864f51647bea
Author: G. Branden Robinson <[email protected]>
AuthorDate: Sun Mar 29 21:19:18 2026 -0500
[libgroff]: Improve #include discipline (4/5).
* src/include/lib.h: Declare `gen_tempname()` here...
* src/libs/libgroff/mksdir.cpp: ...instead of here (as an `extern`).
* src/libs/libgroff/tmpname.cpp: Resequence order of header file
inclusions.
---
ChangeLog | 10 ++++++++++
src/include/lib.h | 3 +++
src/libs/libgroff/mksdir.cpp | 2 --
src/libs/libgroff/tmpname.cpp | 5 +++--
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4fb8d1a6f..58ce5b8f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2026-03-29 G. Branden Robinson <[email protected]>
+
+ [libgroff]: Improve #include discipline.
+
+ * src/include/lib.h: Declare `gen_tempname()` here...
+ * src/libs/libgroff/mksdir.cpp: ...instead of here (as an
+ `extern`).
+ * src/libs/libgroff/tmpname.cpp: Resequence order of header file
+ inclusions.
+
2026-03-29 G. Branden Robinson <[email protected]>
* src/libs/libgroff/strsave.cpp: Fix code style nits. Arrange
diff --git a/src/include/lib.h b/src/include/lib.h
index f58a57e6f..83e1401cc 100644
--- a/src/include/lib.h
+++ b/src/include/lib.h
@@ -79,6 +79,9 @@ int mkstemp(char *tmpl);
// libgroff/mksdir.cpp
int mksdir(char *tmpl);
+// libgroff/tmpname.cpp
+int gen_tempname(char *, int);
+
#ifdef __cplusplus
FILE *xtmpfile(const char **namep = 0 /* nullptr */,
const char *postfix_long = 0 /* nullptr */,
diff --git a/src/libs/libgroff/mksdir.cpp b/src/libs/libgroff/mksdir.cpp
index d492a7456..c3307e43a 100644
--- a/src/libs/libgroff/mksdir.cpp
+++ b/src/libs/libgroff/mksdir.cpp
@@ -26,8 +26,6 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include "lib.h" // mksdir()
-extern int gen_tempname(char *, int = 0);
-
/* Generate a unique temporary directory name from TEMPLATE.
The last six characters of TEMPLATE must be "XXXXXX";
they are replaced with a string that makes the filename unique.
diff --git a/src/libs/libgroff/tmpname.cpp b/src/libs/libgroff/tmpname.cpp
index 5ba1a4ee3..faf4a38c0 100644
--- a/src/libs/libgroff/tmpname.cpp
+++ b/src/libs/libgroff/tmpname.cpp
@@ -29,11 +29,12 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>. */
#include <errno.h>
#include <time.h>
-#include "lib.h"
-
+// operating system services
#include "posix.h"
#include "nonposix.h"
+#include "lib.h" // gen_tempname()
+
#ifndef TMP_MAX
# define TMP_MAX 238328
#endif
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
