Merge branch 'gtkdoc-revert' into 'master'

Revert "doc: Workaround gtkdoc-scan bug leading to undocumented symbols"

See merge request GNOME/glib!1267
This commit is contained in:
Philip Withnall 2019-12-04 12:53:12 +00:00
commit 6e95232b47

View File

@ -451,9 +451,6 @@ typedef const gchar * (*GTranslateFunc) (const gchar *str,
_GLIB_CHECKED_MUL_U32(dest, a, b) _GLIB_CHECKED_MUL_U32(dest, a, b)
#endif #endif
/* FIXME: Hide this from gtkdoc scanner because it confuses its poor regexes.
* https://gitlab.gnome.org/GNOME/gtk-doc/issues/90 */
#ifndef __GTK_DOC_IGNORE__
/* The names of the following inlines are private. Use the macro /* The names of the following inlines are private. Use the macro
* definitions above. * definitions above.
*/ */
@ -477,7 +474,6 @@ static inline gboolean _GLIB_CHECKED_ADD_U64 (guint64 *dest, guint64 a, guint64
static inline gboolean _GLIB_CHECKED_MUL_U64 (guint64 *dest, guint64 a, guint64 b) { static inline gboolean _GLIB_CHECKED_MUL_U64 (guint64 *dest, guint64 a, guint64 b) {
*dest = a * b; return !a || *dest / a == b; } *dest = a * b; return !a || *dest / a == b; }
#endif #endif
#endif /* __GTK_DOC_IGNORE__ */
/* IEEE Standard 754 Single Precision Storage Format (gfloat): /* IEEE Standard 754 Single Precision Storage Format (gfloat):
* *