[groff] 02/24: Continue removal of local getopt implementation.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit 860ab0871104495e6db4a4fc0f959b2db2304b93
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Sat Nov 30 03:29:53 2024 -0600

    Continue removal of local getopt implementation.
    
    * src/include/lib.h:
    * src/libs/libgroff/libgroff.am (libgroff_a_CPPFLAGS):
    * src/utils/pfbtops/pfbtops.c:
    * src/utils/xtotroff/xtotroff.c: Fix straggling definitions of
      `__GETOPT_PREFIX`, which broke the build on Solaris 10.  Continues
      commit 68968197dc, 27 November.
    
    Fixes:
    
      CXX      src/devices/grodvi/dvi.o
    In file included from ./src/include/driver.h:19:0,
                     from src/devices/grodvi/dvi.cpp:30:
    ./src/include/lib.h:36:0: warning: "__GETOPT_PREFIX" redefined
     #define __GETOPT_PREFIX groff_
     ^
    In file included from src/devices/grodvi/dvi.cpp:20:0:
    ./src/include/config.h:1244:0: note: this is the location of the previous 
definition
     #define __GETOPT_PREFIX rpl_
     ^
---
 ChangeLog                     | 9 +++++++++
 src/include/lib.h             | 1 -
 src/libs/libgroff/libgroff.am | 1 -
 src/utils/pfbtops/pfbtops.c   | 2 --
 src/utils/xtotroff/xtotroff.c | 2 --
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 16c1d5032..db07d5794 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-11-30  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       * src/include/lib.h:
+       * src/libs/libgroff/libgroff.am (libgroff_a_CPPFLAGS):
+       * src/utils/pfbtops/pfbtops.c:
+       * src/utils/xtotroff/xtotroff.c: Fix straggling definitions of
+       `__GETOPT_PREFIX`, which broke the build on Solaris 10.
+       Continues commit 68968197dc, 27 November.
+
 2024-11-30  Deri James  <deri@chuzzlewit.myzen.co.uk>
 
        [gropdf]: Using \*[PDFLB] does not work.
diff --git a/src/include/lib.h b/src/include/lib.h
index 6a04dbd12..845763a07 100644
--- a/src/include/lib.h
+++ b/src/include/lib.h
@@ -33,7 +33,6 @@ extern "C" {
 }
 #endif
 
-#define __GETOPT_PREFIX groff_
 #include <getopt.h>
 
 #ifdef HAVE_SETLOCALE
diff --git a/src/libs/libgroff/libgroff.am b/src/libs/libgroff/libgroff.am
index caec5fcd9..cdb810cf3 100644
--- a/src/libs/libgroff/libgroff.am
+++ b/src/libs/libgroff/libgroff.am
@@ -19,7 +19,6 @@ libgroff_srcdir = $(top_srcdir)/src/libs/libgroff
 noinst_LIBRARIES += libgroff.a
 libgroff_a_CPPFLAGS = \
   $(AM_CPPFLAGS) \
-  -D__GETOPT_PREFIX=groff_ \
   -DENABLE_RELOCATABLE=1 \
   -DLIBDIR=\"$(libdir)\"
 
diff --git a/src/utils/pfbtops/pfbtops.c b/src/utils/pfbtops/pfbtops.c
index 0e3cbd796..274ca48a4 100644
--- a/src/utils/pfbtops/pfbtops.c
+++ b/src/utils/pfbtops/pfbtops.c
@@ -22,8 +22,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>. */
 #include <config.h>
 #endif
 
-#define __GETOPT_PREFIX groff_
-
 #include <assert.h> // assert()
 #include <errno.h> // errno
 #include <stdio.h>
diff --git a/src/utils/xtotroff/xtotroff.c b/src/utils/xtotroff/xtotroff.c
index a421b3a55..f9be2570a 100644
--- a/src/utils/xtotroff/xtotroff.c
+++ b/src/utils/xtotroff/xtotroff.c
@@ -26,8 +26,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>. */
 #include <config.h>
 #endif
 
-#define __GETOPT_PREFIX groff_
-
 #include <X11/Xlib.h>
 #include <stdbool.h>
 #include <stdio.h>