bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

libtextstyle-optional: sync with current not-yet-released libtextstyle


From: Bruno Haible
Subject: libtextstyle-optional: sync with current not-yet-released libtextstyle
Date: Tue, 15 Oct 2019 10:51:16 +0200
User-agent: KMail/5.1.3 (Linux/4.4.0-165-generic; KDE/5.18.0; x86_64; ; )

The next release of GNU gettext's libtextstyle will have a couple of new
functions. Not-yet-GNU poke uses them already and fails when using the
fallback from gnulib:

poke-pk-term.o: In function `pk_term_hyperlink':
/builds/gnu-poke/ci-distcheck/poke/src/pk-term.c:136: undefined reference to 
`styled_ostream_set_hyperlink'
poke-pk-term.o: In function `pk_term_end_hyperlink':
/builds/gnu-poke/ci-distcheck/poke/src/pk-term.c:142: undefined reference to 
`styled_ostream_set_hyperlink'
collect2: error: ld returned 1 exit status
Makefile:1650: recipe for target 'poke' failed
make[2]: *** [poke] Error 1

This patch is necessary to fix this.


2019-10-15  Bruno Haible  <address@hidden>

        libtextstyle-optional: Sync with current not-yet-released libtextstyle.
        * libtextstyle-optional (styled_ostream_get_hyperlink_ref,
        styled_ostream_get_hyperlink_id, styled_ostream_set_hyperlink,
        term_ostream_get_hyperlink_ref, term_ostream_get_hyperlink_id,
        term_ostream_set_hyperlink): New functions.
        (term_styled_ostream_get_hyperlink_ref,
        term_styled_ostream_get_hyperlink_id,
        term_styled_ostream_set_hyperlink): New function aliases.

diff --git a/lib/textstyle.in.h b/lib/textstyle.in.h
index 3eb7193..fedc7d8 100644
--- a/lib/textstyle.in.h
+++ b/lib/textstyle.in.h
@@ -132,6 +132,25 @@ styled_ostream_end_use_class (styled_ostream_t stream 
_GL_UNUSED,
 {
 }
 
+static inline const char *
+styled_ostream_get_hyperlink_ref (styled_ostream_t stream _GL_UNUSED)
+{
+  return NULL;
+}
+
+static inline const char *
+styled_ostream_get_hyperlink_id (styled_ostream_t stream _GL_UNUSED)
+{
+  return NULL;
+}
+
+static inline void
+styled_ostream_set_hyperlink (styled_ostream_t stream _GL_UNUSED,
+                              const char *ref _GL_UNUSED,
+                              const char *id _GL_UNUSED)
+{
+}
+
 static inline void
 styled_ostream_flush_to_current_style (styled_ostream_t stream _GL_UNUSED)
 {
@@ -266,6 +285,25 @@ term_ostream_set_underline (term_ostream_t stream 
_GL_UNUSED,
 {
 }
 
+static inline const char *
+term_ostream_get_hyperlink_ref (term_ostream_t stream _GL_UNUSED)
+{
+  return NULL;
+}
+
+static inline const char *
+term_ostream_get_hyperlink_id (term_ostream_t stream _GL_UNUSED)
+{
+  return NULL;
+}
+
+static inline void
+term_ostream_set_hyperlink (term_ostream_t stream _GL_UNUSED,
+                            const char *ref _GL_UNUSED,
+                            const char *id _GL_UNUSED)
+{
+}
+
 static inline void
 term_ostream_flush_to_current_style (term_ostream_t stream)
 {
@@ -304,6 +342,9 @@ typedef styled_ostream_t term_styled_ostream_t;
 #define term_styled_ostream_free ostream_free
 #define term_styled_ostream_begin_use_class styled_ostream_begin_use_class
 #define term_styled_ostream_end_use_class styled_ostream_end_use_class
+#define term_styled_ostream_get_hyperlink_ref styled_ostream_get_hyperlink_ref
+#define term_styled_ostream_get_hyperlink_id styled_ostream_get_hyperlink_id
+#define term_styled_ostream_set_hyperlink styled_ostream_set_hyperlink
 #define term_styled_ostream_flush_to_current_style 
styled_ostream_flush_to_current_style
 
 static inline term_styled_ostream_t




reply via email to

[Prev in Thread] Current Thread [Next in Thread]