On the trunk:

Fixed gcc warnings in latest mod_md version.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1819943 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/md/md.h b/modules/md/md.h
index a35aaac0a48bdf52e3648510a2b87ff52e4def68..1aa19adaf63c2f376e59475fde49ed48b4f7f14d 100644 (file)
--- a/modules/md/md.h
+++ b/modules/md/md.h
@@ -280,7 +280,7 @@ struct md_creds_t {
  * cascaded apr_status_t checks. */
 #define MD_CHK_VARS                 const char *md_chk_
 #define MD_LAST_CHK                 md_chk_
-#define MD_CHK_STEP(c, status, s)   (md_chk_ = s, status == (rv = (c)))
+#define MD_CHK_STEP(c, status, s)   (md_chk_ = s, (void)md_chk_, status == (rv = (c)))
 #define MD_CHK(c, status)           MD_CHK_STEP(c, status, #c)
 #define MD_IS_ERR(c, err)           (md_chk_ = #c, APR_STATUS_IS_##err((rv = (c))))
 #define MD_CHK_SUCCESS(c)           MD_CHK(c, APR_SUCCESS)

diff --git a/modules/md/md_crypt.c b/modules/md/md_crypt.c
index d1f8bd05ecfd324240656cc6ac0a31ffe4318794..c35fef518e0c4d6f4f5551156a5820817a655b37 100644 (file)
--- a/modules/md/md_crypt.c
+++ b/modules/md/md_crypt.c
@@ -1107,7 +1107,7 @@ static apr_status_t sk_add_alt_names(STACK_OF(X509_EXTENSION) *exts,
 #define MD_OID_MUST_STAPLE_SNAME        "tlsfeature"
 #define MD_OID_MUST_STAPLE_LNAME        "TLS Feature" 
 
-static int get_must_staple_nid()
+static int get_must_staple_nid(void)
 {
     /* Funny API, the OID for must staple might be configured or
      * might be not. In the second case, we need to add it. But adding