From f7edc2c3ff634514a6a1bf9d1fac34536bc727ab Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Wed, 27 Oct 2021 16:54:16 +0300
Subject: Upgrade to 0.29.0.gfm.2

---
 libcmark-gfm/libcmark-gfm/buildfile           |  6 ++---
 libcmark-gfm/libcmark-gfm/cmark-gfm_export.h  | 32 ++++++++++++---------------
 libcmark-gfm/libcmark-gfm/cmark-gfm_version.h |  3 +--
 libcmark-gfm/libcmark-gfm/config.h            |  4 ++--
 4 files changed, 19 insertions(+), 26 deletions(-)

(limited to 'libcmark-gfm/libcmark-gfm')

diff --git a/libcmark-gfm/libcmark-gfm/buildfile b/libcmark-gfm/libcmark-gfm/buildfile
index 9aff2ba..8d0ccfb 100644
--- a/libcmark-gfm/libcmark-gfm/buildfile
+++ b/libcmark-gfm/libcmark-gfm/buildfile
@@ -44,11 +44,9 @@ if ($c.class == 'gcc')
   # Disable warnings that pop up with -Wextra. Upstream doesn't seem to care
   # about these and it is not easy to disable specific warnings in a way that
   # works across compilers/version (some -Wno-* options are only recognized in
-  # newer versions). There are still some warnings left that appear for
-  # certain platforms/compilers. We pass them through but disable treating
-  # them as errors.
+  # newer versions).
   #
-  c.coptions += -Wno-extra -Wno-error
+  c.coptions += -Wno-extra
 }
 
 # Export options.
diff --git a/libcmark-gfm/libcmark-gfm/cmark-gfm_export.h b/libcmark-gfm/libcmark-gfm/cmark-gfm_export.h
index ca6b3cf..ca72d98 100644
--- a/libcmark-gfm/libcmark-gfm/cmark-gfm_export.h
+++ b/libcmark-gfm/libcmark-gfm/cmark-gfm_export.h
@@ -5,43 +5,39 @@
 #ifndef CMARK_GFM_EXPORT_H
 #define CMARK_GFM_EXPORT_H
 
-/*
- * The upstream's version of this file is auto-generated by cmake. It looks
- * quite convoluted and contains unused macro definitions. Moreover it seems
- * to be broken, mismatching build/use pre-processor options (see the issue
- * #156). Note that currently the upstream disables building shared libraries
- * with VC.
+/* The upstream's version of this file is auto-generated by cmake. It looks
+ * quite convoluted and contains unused macro definitions. Note that currently
+ * the upstream disables building shared libraries with VC.
  *
  * We implement this file from scratch using the standard build2 export header
  * as a template.
  */
-#if defined(CMARK_GFM_STATIC)         // Using static.
+#if defined(CMARK_GFM_STATIC)         /* Using static. */
 #  define CMARK_GFM_EXPORT
-#elif defined(CMARK_GFM_STATIC_BUILD) // Building static.
+#elif defined(CMARK_GFM_STATIC_BUILD) /* Building static. */
 #  define CMARK_GFM_EXPORT
-#elif defined(CMARK_GFM_SHARED)       // Using shared.
+#elif defined(CMARK_GFM_SHARED)       /* Using shared. */
 #  ifdef _WIN32
 #    define CMARK_GFM_EXPORT __declspec(dllimport)
 #  else
 #    define CMARK_GFM_EXPORT
 #  endif
-#elif defined(CMARK_GFM_SHARED_BUILD) // Building shared.
+#elif defined(CMARK_GFM_SHARED_BUILD) /* Building shared. */
 #  ifdef _WIN32
 #    define CMARK_GFM_EXPORT __declspec(dllexport)
 #  else
 #    define CMARK_GFM_EXPORT __attribute__((visibility("default")))
 #  endif
 #else
-// If none of the above macros are defined, then we assume we are being used
-// by some third-party build system that cannot/doesn't signal the library
-// type. Note that this fallback works for both static and shared but in case
-// of shared will be sub-optimal compared to having dllimport.
-//
-#  define CMARK_GFM_EXPORT            // Using static or shared.
+/* If none of the above macros are defined, then we assume we are being used
+ * by some third-party build system that cannot/doesn't signal the library
+ * type. Note that this fallback works for both static and shared but in case
+ * of shared will be sub-optimal compared to having dllimport.
+ */
+#  define CMARK_GFM_EXPORT            /* Using static or shared. */
 #endif
 
-/*
- * Undefining these cmake-generated macros is not technically required, but
+/* Undefining these cmake-generated macros is not technically required, but
  * let's keep them for the record.
  */
 #undef CMARK_GFM_NO_EXPORT
diff --git a/libcmark-gfm/libcmark-gfm/cmark-gfm_version.h b/libcmark-gfm/libcmark-gfm/cmark-gfm_version.h
index 928f8b9..1b7b67b 100644
--- a/libcmark-gfm/libcmark-gfm/cmark-gfm_version.h
+++ b/libcmark-gfm/libcmark-gfm/cmark-gfm_version.h
@@ -1,5 +1,4 @@
-/*
- * file      : libcmark-gfm/cmark-gfm_version.h
+/* file      : libcmark-gfm/cmark-gfm_version.h
  * license   : FreeBSD License; see accompanying COPYING file
  */
 
diff --git a/libcmark-gfm/libcmark-gfm/config.h b/libcmark-gfm/libcmark-gfm/config.h
index 955b03b..cd62e03 100644
--- a/libcmark-gfm/libcmark-gfm/config.h
+++ b/libcmark-gfm/libcmark-gfm/config.h
@@ -5,8 +5,8 @@
 extern "C" {
 #endif
 
-/*
- * For the semantics of the following macros refer to src/CMakeLists.txt.
+/* For the semantics of the following macros refer to upstream's
+ * src/CMakeLists.txt.
  */
 
 #define HAVE_STDBOOL_H
-- 
cgit v1.1