In private header files, __BEGIN_DECLS and __END_DECLS are pointless.

Because these work slightly differently on different systems,
they are becoming a maintenance burden in the portable version,
so delete them.

Besides, one of the chief design goals of the mandoc toolbox is to
make sure that nothing related to documentation requires C++.
Consequently, linking mandoc against any kind of C++ program would
defeat the purpose and is not supported.
I don't understand why kristaps@ added them in the first place.

diff --git a/INSTALL b/INSTALL
index fffff39fd4c6d204f3de1edc956f7e0dc2b8a1c2..085fb3e1c672a57f6cb409791d60e79538c0e965 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-$Id: INSTALL,v 1.12 2015/07/19 06:05:16 schwarze Exp $
+$Id: INSTALL,v 1.13 2015/11/07 14:01:16 schwarze Exp $
 
 About mdocml, the portable mandoc distribution
 ----------------------------------------------
@@ -110,6 +110,11 @@ If you run into that problem, set "HAVE_FTS=0" in configure.local.
 If your system does not have it, the bundled compatibility version
 will be used, so you probably need not worry about it.
 
+One of the chief design goals of the mandoc toolbox is to make
+sure that nothing related to documentation requires C++.
+Consequently, linking mandoc against any kind of C++ program
+would defeat the purpose and is not supported.
+
 
 Checking autoconfiguration quality
 ----------------------------------

diff --git a/compat_fts.h b/compat_fts.h
index 426eaac343dafb8c28a86536ac1d79ca11ef11ef..1eed2ae380fd320eefd96230364be33b897396b7 100644 (file)
--- a/compat_fts.h
+++ b/compat_fts.h
@@ -92,11 +92,10 @@ typedef struct _ftsent {
        char fts_name[1];               /* file name */
 } FTSENT;
 
-__BEGIN_DECLS
+
 int     fts_close(FTS *);
 FTS    *fts_open(char * const *, int, void *);
 FTSENT *fts_read(FTS *);
 int     fts_set(FTS *, FTSENT *, int);
-__END_DECLS
 
 #endif /* !_FTS_H_ */

diff --git a/compat_ohash.h b/compat_ohash.h
index e3124c96b124fdd14dcd5cf9fa5e90e8360734d7..58fb220c96c0e91212b45d43d3098fc483e4eddb 100644 (file)
--- a/compat_ohash.h
+++ b/compat_ohash.h
@@ -49,7 +49,6 @@ struct ohash {
  * a hashing table index (opaque) to be used in find/insert/remove.
  * The keys are stored at a known position in the client data.
  */
-__BEGIN_DECLS
 void ohash_init(struct ohash *, unsigned, struct ohash_info *);
 void ohash_delete(struct ohash *);
 
@@ -69,5 +68,5 @@ uint32_t ohash_interval(const char *, const char **);
 
 unsigned int ohash_qlookupi(struct ohash *, const char *, const char **);
 unsigned int ohash_qlookup(struct ohash *, const char *);
-__END_DECLS
+
 #endif

diff --git a/compat_stringlist.h b/compat_stringlist.h
index 424f1a239cb88633da41431280855b874f2f63f0..f04e8435047dce30b070a0a29358a632ef2e79f8 100644 (file)
--- a/compat_stringlist.h
+++ b/compat_stringlist.h
@@ -1,4 +1,4 @@
-/*     $Id: compat_stringlist.h,v 1.3 2015/05/20 23:43:03 schwarze Exp $       */
+/*     $Id: compat_stringlist.h,v 1.4 2015/11/07 14:01:16 schwarze Exp $       */
 /*     $NetBSD: stringlist.h,v 1.2 1997/01/17 06:11:36 lukem Exp $     */
 
 /*
@@ -38,9 +38,8 @@ typedef struct _stringlist {
        size_t    sl_cur;
 } StringList;
 
-__BEGIN_DECLS
+
 StringList *sl_init(void);
 int     sl_add(StringList *, char *);
 void    sl_free(StringList *, int);
 char   *sl_find(StringList *, const char *);
-__END_DECLS

diff --git a/configure b/configure
index 54ebfca196c30adc43e73ef8f4a75ae1321c8594..cae2f5c9b170616273489066d0f110441b3de885 100755 (executable)
--- a/configure
+++ b/configure
@@ -276,6 +276,10 @@ fi
 exec > config.h
 
 cat << __HEREDOC__
+#ifdef __cplusplus
+#error "Do not use C++.  See the INSTALL file."
+#endif
+
 #ifndef MANDOC_CONFIG_H
 #define MANDOC_CONFIG_H
 
@@ -331,21 +335,6 @@ cat << __HEREDOC__
 #define BINM_SOELIM "${BINM_SOELIM}"
 #define BINM_WHATIS "${BINM_WHATIS}"
 
-#if !defined(__BEGIN_DECLS)
-#  ifdef __cplusplus
-#  define      __BEGIN_DECLS           extern "C" {
-#  else
-#  define      __BEGIN_DECLS
-#  endif
-#endif
-#if !defined(__END_DECLS)
-#  ifdef __cplusplus
-#  define      __END_DECLS             }
-#  else
-#  define      __END_DECLS
-#  endif
-#endif
-
 __HEREDOC__
 
 if [ ${HAVE_ERR} -eq 0 ]; then

diff --git a/html.h b/html.h
index e6644dc85d83a35af86d5403764d66d3a9654c3e..27dc140185da6582335ba1f1ff14405d8c308c2a 100644 (file)
--- a/html.h
+++ b/html.h
@@ -1,4 +1,4 @@
-/*     $Id: html.h,v 1.71 2015/10/13 22:59:54 schwarze Exp $ */
+/*     $Id: html.h,v 1.72 2015/11/07 14:01:16 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -142,7 +142,6 @@ struct      html {
 #define        HTML_FRAGMENT    (1 << 0) /* don't emit HTML/HEAD/BODY */
 };
 
-__BEGIN_DECLS
 
 struct tbl_span;
 struct eqn;
@@ -175,5 +174,3 @@ void                  buffmt_man(struct html *,
 void             buffmt_includes(struct html *, const char *);
 
 int              html_strlen(const char *);
-
-__END_DECLS

diff --git a/libman.h b/libman.h
index 90c9803a02eadf0f0efd3822e079b9248fd17780..65849602c27cc9d0b92955ebecf7294ea4582397 100644 (file)
--- a/libman.h
+++ b/libman.h
@@ -1,4 +1,4 @@
-/*     $Id: libman.h,v 1.78 2015/10/22 21:54:23 schwarze Exp $ */
+/*     $Id: libman.h,v 1.79 2015/11/07 14:01:16 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -34,11 +34,8 @@ struct       man_macro {
 
 extern const struct man_macro *const man_macros;
 
-__BEGIN_DECLS
 
 int              man_hash_find(const char *);
 void             man_node_validate(struct roff_man *);
 void             man_state(struct roff_man *, struct roff_node *);
 void             man_unscope(struct roff_man *, const struct roff_node *);
-
-__END_DECLS

diff --git a/libmandoc.h b/libmandoc.h
index 38d397e2da16846f1c97a371b598222be5ec5140..939ec83c574ddcfb239c6b6a96c9eb357e4e8864 100644 (file)
--- a/libmandoc.h
+++ b/libmandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmandoc.h,v 1.61 2015/10/13 22:59:54 schwarze Exp $ */
+/*     $Id: libmandoc.h,v 1.62 2015/11/07 14:01:16 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -32,7 +32,6 @@ struct        buf {
        size_t   sz;
 };
 
-__BEGIN_DECLS
 
 struct mparse;
 struct tbl_span;
@@ -84,5 +83,3 @@ int            roff_getformat(const struct roff *);
 
 const struct tbl_span  *roff_span(const struct roff *);
 const struct eqn       *roff_eqn(const struct roff *);
-
-__END_DECLS

diff --git a/libmdoc.h b/libmdoc.h
index 5240fd0c209084e0e682e226824a38d00a810f44..5a6cc3ed9ba87fe6da147677d3e7faf4a49f6fa2 100644 (file)
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: libmdoc.h,v 1.107 2015/10/20 02:01:31 schwarze Exp $ */
+/*     $Id: libmdoc.h,v 1.108 2015/11/07 14:01:16 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -62,7 +62,6 @@ enum  mdelim {
 
 extern const struct mdoc_macro *const mdoc_macros;
 
-__BEGIN_DECLS
 
 void             mdoc_macro(MACRO_PROT_ARGS);
 void             mdoc_elem_alloc(struct roff_man *, int, int,
@@ -87,5 +86,3 @@ void            mdoc_argv(struct roff_man *, int, int,
 enum margserr    mdoc_args(struct roff_man *, int,
                        int *, char *, int, char **);
 enum mdelim      mdoc_isdelim(const char *);
-
-__END_DECLS

diff --git a/libroff.h b/libroff.h
index 08ed1f7925d2332837650cb424ec248e1fad8fd7..897a55ae61cb6382d19616d92ac3de968941e52c 100644 (file)
--- a/libroff.h
+++ b/libroff.h
@@ -1,4 +1,4 @@
-/*     $Id: libroff.h,v 1.38 2015/01/30 04:11:50 schwarze Exp $ */
+/*     $Id: libroff.h,v 1.39 2015/11/07 14:01:16 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -60,7 +60,6 @@ struct        eqn_def {
        size_t            valsz;
 };
 
-__BEGIN_DECLS
 
 struct tbl_node        *tbl_alloc(int, int, struct mparse *);
 void            tbl_restart(int, int, struct tbl_node *);
@@ -78,5 +77,3 @@ enum rofferr   eqn_end(struct eqn_node **);
 void            eqn_free(struct eqn_node *);
 enum rofferr    eqn_read(struct eqn_node **, int,
                        const char *, int, int *);
-
-__END_DECLS

diff --git a/main.h b/main.h
index bf2a0646c48fef9655ee1e2c7cd190f0bb5d32a0..e9e7e86686777856f740cb53798f14070cf7381c 100644 (file)
--- a/main.h
+++ b/main.h
@@ -1,4 +1,4 @@
-/*     $Id: main.h,v 1.23 2015/10/13 22:59:54 schwarze Exp $ */
+/*     $Id: main.h,v 1.24 2015/11/07 14:01:16 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -18,8 +18,6 @@
 
 #define        UNCONST(a)      ((void *)(uintptr_t)(const void *)(a))
 
-__BEGIN_DECLS
-
 struct roff_man;
 struct manoutput;
 
@@ -53,5 +51,3 @@ void            pspdf_free(void *);
 
 void             terminal_mdoc(void *, const struct roff_man *);
 void             terminal_man(void *, const struct roff_man *);
-
-__END_DECLS

diff --git a/man.h b/man.h
index 5a8d25937c7373f8d442349e13d24e413d803a9a..8f63f3b99ecdf8ce6bd92f3777c3f684c4a1f4fd 100644 (file)
--- a/man.h
+++ b/man.h
@@ -1,4 +1,4 @@
-/*     $Id: man.h,v 1.76 2015/10/22 21:54:23 schwarze Exp $ */
+/*     $Id: man.h,v 1.77 2015/11/07 14:01:16 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -59,11 +59,8 @@
 /* Names of macros. */
 extern const char *const *man_macronames;
 
-__BEGIN_DECLS
 
 struct roff_man;
 
 const struct mparse    *man_mparse(const struct roff_man *);
 void                    man_validate(struct roff_man *);
-
-__END_DECLS

diff --git a/manconf.h b/manconf.h
index 0784b8d647a0b7e6eca42bba0a0aa89b4c3334cb..782269e7b33d71d804500235b696e2d7e23fb9e6 100644 (file)
--- a/manconf.h
+++ b/manconf.h
@@ -42,10 +42,7 @@ struct       manconf {
        struct manpaths           manpath;
 };
 
-__BEGIN_DECLS
 
 void    manconf_parse(struct manconf *, const char *, char *, char *);
 void    manconf_output(struct manoutput *, const char *);
 void    manconf_free(struct manconf *);
-
-__END_DECLS

diff --git a/mandoc.h b/mandoc.h
index d37187f3eccf7809eb7ba3886e9f825d8f409cfd..f7f72785ff306fd2d96e2c1a8488f8a297015ea8 100644 (file)
--- a/mandoc.h
+++ b/mandoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mandoc.h,v 1.207 2015/10/30 19:04:16 schwarze Exp $ */
+/*     $Id: mandoc.h,v 1.208 2015/11/07 14:01:16 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -408,7 +408,6 @@ enum        mandoc_esc {
 typedef        void    (*mandocmsg)(enum mandocerr, enum mandoclevel,
                        const char *, int, int, const char *);
 
-__BEGIN_DECLS
 
 struct mparse;
 struct roff_man;
@@ -434,5 +433,3 @@ void                  mparse_result(struct mparse *,
 const char      *mparse_getkeep(const struct mparse *);
 const char      *mparse_strerror(enum mandocerr);
 const char      *mparse_strlevel(enum mandoclevel);
-
-__END_DECLS

diff --git a/mandoc_aux.h b/mandoc_aux.h
index e72fe4e40edaf6ad9e02381ffb40d7ffc6f02d95..2ae3a0cd2defce45be904bce0c3890175298428f 100644 (file)
--- a/mandoc_aux.h
+++ b/mandoc_aux.h
@@ -1,4 +1,4 @@
-/*     $Id: mandoc_aux.h,v 1.3 2014/12/01 04:05:32 schwarze Exp $ */
+/*     $Id: mandoc_aux.h,v 1.4 2015/11/07 14:01:16 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -16,8 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-__BEGIN_DECLS
-
 int              mandoc_asprintf(char **, const char *, ...);
 void            *mandoc_calloc(size_t, size_t);
 void            *mandoc_malloc(size_t);
@@ -25,5 +23,3 @@ void           *mandoc_realloc(void *, size_t);
 void            *mandoc_reallocarray(void *, size_t, size_t);
 char            *mandoc_strdup(const char *);
 char            *mandoc_strndup(const char *, size_t);
-
-__END_DECLS

diff --git a/mandoc_ohash.h b/mandoc_ohash.h
index 7e24517c68cbaf5c24e2ad069d92ae7ce425f4f8..571c4cda93c723191579415474a4f9d77000284d 100644 (file)
--- a/mandoc_ohash.h
+++ b/mandoc_ohash.h
@@ -1,4 +1,4 @@
-/*     $Id: mandoc_ohash.h,v 1.1 2015/10/13 15:53:05 schwarze Exp $    */
+/*     $Id: mandoc_ohash.h,v 1.2 2015/11/07 14:01:16 schwarze Exp $    */
 /*
  * Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -20,8 +20,4 @@
 #include "compat_ohash.h"
 #endif
 
-__BEGIN_DECLS
-
 void             mandoc_ohash_init(struct ohash *, unsigned int, ptrdiff_t);
-
-__END_DECLS

diff --git a/mansearch.h b/mansearch.h
index 14ec8ceacd8756ff503360b3aac90b001599b52f..7f68ff676750373cc928cb8e5b8c4912c2ae6e17 100644 (file)
--- a/mansearch.h
+++ b/mansearch.h
@@ -1,4 +1,4 @@
-/*     $Id: mansearch.h,v 1.23 2014/12/01 08:05:52 schwarze Exp $ */
+/*     $Id: mansearch.h,v 1.24 2015/11/07 14:01:16 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -95,7 +95,6 @@ struct        mansearch {
        int              firstmatch; /* first matching database only */
 };
 
-__BEGIN_DECLS
 
 struct manpaths;
 
@@ -107,5 +106,3 @@ int mansearch(const struct mansearch *cfg, /* options */
                struct manpage **res, /* results */
                size_t *ressz); /* results returned */
 void   mansearch_free(struct manpage *, size_t);
-
-__END_DECLS

diff --git a/mdoc.h b/mdoc.h
index f793cc23c1210b00935f908561620226bca4b3bc..ebe4391ef610bd56b1767da1425ceaad60d127af 100644 (file)
--- a/mdoc.h
+++ b/mdoc.h
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.h,v 1.143 2015/10/20 02:01:31 schwarze Exp $ */
+/*     $Id: mdoc.h,v 1.144 2015/11/07 14:01:16 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -280,8 +280,5 @@ extern      const char *const *mdoc_macronames;
 /* Names of macro args.  Index is enum mdocargt. */
 extern const char *const *mdoc_argnames;
 
-__BEGIN_DECLS
 
 void            mdoc_validate(struct roff_man *);
-
-__END_DECLS

diff --git a/out.h b/out.h
index cc218f4fec31a6c806d47428bd1d73b8e1c504f9..2c1cf3fe9701986b45c547155700c5a95d78c8e1 100644 (file)
--- a/out.h
+++ b/out.h
@@ -1,4 +1,4 @@
-/*     $Id: out.h,v 1.26 2014/12/01 08:05:52 schwarze Exp $ */
+/*     $Id: out.h,v 1.27 2015/11/07 14:01:16 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -60,12 +60,9 @@ struct       rofftbl {
             (p)->scale = (v); } \
        while (/* CONSTCOND */ 0)
 
-__BEGIN_DECLS
 
 struct tbl_span;
 
 int              a2roffsu(const char *, struct roffsu *, enum roffscale);
 void             tblcalc(struct rofftbl *tbl,
                        const struct tbl_span *, size_t);
-
-__END_DECLS

diff --git a/roff.h b/roff.h
index f32ffd253f6e6a582b92b357f7a90f8aa72824a2..cbee382280ec8bbcad83b101a57f2d520c718f0c 100644 (file)
--- a/roff.h
+++ b/roff.h
@@ -161,8 +161,5 @@ struct      roff_man {
        enum roff_next    next;    /* Where to put the next node. */
 };
 
-__BEGIN_DECLS
 
 void            deroff(char **, const struct roff_node *);
-
-__END_DECLS

diff --git a/roff_int.h b/roff_int.h
index 8c9cc0973ecac4f73b7b6be72c74cbd2d2282484..5567b758deb278505d0a8717b8e48e8d89d37071 100644 (file)
--- a/roff_int.h
+++ b/roff_int.h
@@ -1,4 +1,4 @@
-/*     $Id: roff_int.h,v 1.6 2015/10/22 21:54:23 schwarze Exp $        */
+/*     $Id: roff_int.h,v 1.7 2015/11/07 14:01:16 schwarze Exp $        */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -16,8 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-__BEGIN_DECLS
-
 struct roff_node *roff_node_alloc(struct roff_man *, int, int,
                        enum roff_type, int);
 void             roff_node_append(struct roff_man *, struct roff_node *);
@@ -41,5 +39,3 @@ void            roff_node_delete(struct roff_man *, struct roff_node *);
 
 void             man_breakscope(struct roff_man *, int);
 void             mdoc_argv_free(struct mdoc_arg *);
-
-__END_DECLS

diff --git a/tag.h b/tag.h
index 0cf5c90b2838886801a558ddc7b49350aafef78c..f00c7f38654b4a708137c973ca6ff37f1743fdde 100644 (file)
--- a/tag.h
+++ b/tag.h
@@ -1,4 +1,4 @@
-/*      $Id: tag.h,v 1.5 2015/07/28 18:38:55 schwarze Exp $    */
+/*      $Id: tag.h,v 1.6 2015/11/07 14:01:16 schwarze Exp $    */
 /*
  * Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -22,11 +22,8 @@ struct       tag_files {
        int      tfd;
 };
 
-__BEGIN_DECLS
 
 struct tag_files *tag_init(void);
 void    tag_put(const char *, int, size_t);
 void    tag_write(void);
 void    tag_unlink(void);
-
-__END_DECLS

diff --git a/term.h b/term.h
index 1d0d78d501379a5f35da70dd92ac97ea52003a8c..fabc117d64c33990479d28aea45311a4c36a4ab8 100644 (file)
--- a/term.h
+++ b/term.h
@@ -1,4 +1,4 @@
-/*     $Id: term.h,v 1.117 2015/10/13 22:59:54 schwarze Exp $ */
+/*     $Id: term.h,v 1.118 2015/11/07 14:01:16 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -105,7 +105,6 @@ struct      termp {
        struct termp_ps  *ps;
 };
 
-__BEGIN_DECLS
 
 struct tbl_span;
 struct eqn;
@@ -134,5 +133,3 @@ void                  term_fontpop(struct termp *);
 void             term_fontpopq(struct termp *, int);
 void             term_fontrepl(struct termp *, enum termfont);
 void             term_fontlast(struct termp *);
-
-__END_DECLS