commit cbb9c78de081e37cf0b2ab6f35022abf89507d9c (HEAD, refs/remotes/origin/master)
Author: Phillip Lord <phillip.lord@russet.org.uk>
Date:   Thu May 3 21:40:34 2018 +0100

    Fix windows snapshot building
    
    * admin/nt/dist-build/build-zips.sh: Fix broken if statement

diff --git a/admin/nt/dist-build/build-zips.sh b/admin/nt/dist-build/build-zips.sh
index d954683c8f..7ffa862476 100755
--- a/admin/nt/dist-build/build-zips.sh
+++ b/admin/nt/dist-build/build-zips.sh
@@ -190,8 +190,10 @@ else
 fi
 
 echo Checking for required branch
-if [ -n $REQUIRED_BRANCH ];
+if [ -z $REQUIRED_BRANCH ];
 then
+    :
+else
     BRANCH=$REQUIRED_BRANCH
     echo [build] Building from Branch $BRANCH
     VERSION=$VERSION-$BRANCH

commit a2003f9663e5649894b05695f7f2b11a3fa96339
Author: Phillip Lord <phillip.lord@russet.org.uk>
Date:   Sun Apr 8 13:40:48 2018 +0100

    * admin/nt/dist-build/build-zips.sh: Support building of branches

diff --git a/admin/nt/dist-build/build-zips.sh b/admin/nt/dist-build/build-zips.sh
index ec41ec8c46..d954683c8f 100755
--- a/admin/nt/dist-build/build-zips.sh
+++ b/admin/nt/dist-build/build-zips.sh
@@ -108,7 +108,7 @@ BUILD_64=1
 GIT_UP=0
 CONFIG=1
 
-while getopts "36ghnsiV:" opt; do
+while getopts "36gb:hnsiV:" opt; do
   case $opt in
     3)
         BUILD_32=1
@@ -132,6 +132,10 @@ while getopts "36ghnsiV:" opt; do
     i)
         BUILD=0
         ;;
+    b)
+        REQUIRED_BRANCH=$OPTARG
+        echo "Setting Required branch $REQUIRED_BRANCH"
+        ;;
     V)
         VERSION=$OPTARG
         ;;
@@ -185,6 +189,17 @@ else
     OF_VERSION="$VERSION-`date +%Y-%m-%d`"
 fi
 
+echo Checking for required branch
+if [ -n $REQUIRED_BRANCH ];
+then
+    BRANCH=$REQUIRED_BRANCH
+    echo [build] Building from Branch $BRANCH
+    VERSION=$VERSION-$BRANCH
+    OF_VERSION="$VERSION-`date +%Y-%m-%d`"
+    ## Use snapshot dependencies
+    SNAPSHOT=1
+fi
+
 if (($GIT_UP))
 then
     git_up

commit ef1deb48f4be14956c2fcd5fce947bb301134cf9
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Thu May 3 11:15:28 2018 -0700

    More porting to GCC 8 of --enable-gcc-warnings
    
    * lwlib/lwlib-Xaw.h (xaw_update_one_value, xaw_popup_menu):
    * lwlib/lwlib-Xlw.h (xlw_update_one_value, xlw_pop_instance):
    * lwlib/lwlib.h (lw_allow_resizing, lw_set_main_areas) [!USE_MOTIF]:
    No longer const.
    * src/emacs-module.c: Ignore -Wcast-function-type.

diff --git a/lwlib/lwlib-Xaw.h b/lwlib/lwlib-Xaw.h
index 363334b575..644676f320 100644
--- a/lwlib/lwlib-Xaw.h
+++ b/lwlib/lwlib-Xaw.h
@@ -15,15 +15,13 @@ void
 xaw_update_one_widget (widget_instance *, Widget, widget_value *, Boolean);
 
 void
-xaw_update_one_value (widget_instance *, Widget, widget_value *)
-  ATTRIBUTE_CONST;
+xaw_update_one_value (widget_instance *, Widget, widget_value *);
 
 void
 xaw_destroy_instance (widget_instance *);
 
 void
-xaw_popup_menu (Widget, XEvent *)
-  ATTRIBUTE_CONST;
+xaw_popup_menu (Widget, XEvent *);
 
 void
 xaw_pop_instance (widget_instance *, Boolean);
diff --git a/lwlib/lwlib-Xlw.h b/lwlib/lwlib-Xlw.h
index 2d38eb7be6..b0790dc3a5 100644
--- a/lwlib/lwlib-Xlw.h
+++ b/lwlib/lwlib-Xlw.h
@@ -15,15 +15,13 @@ xlw_update_one_widget (widget_instance* instance, Widget widget,
 
 void
 xlw_update_one_value (widget_instance* instance, Widget widget,
-		      widget_value* val)
-  ATTRIBUTE_CONST;
+		      widget_value* val);
 
 void
 xlw_destroy_instance (widget_instance* instance);
 
 void
-xlw_pop_instance (widget_instance* instance, Boolean up)
-  ATTRIBUTE_CONST;
+xlw_pop_instance (widget_instance* instance, Boolean up);
 
 void
 xlw_popup_menu (Widget widget, XEvent * event);
diff --git a/lwlib/lwlib.h b/lwlib/lwlib.h
index 66730fd8d7..41d3e0139d 100644
--- a/lwlib/lwlib.h
+++ b/lwlib/lwlib.h
@@ -111,15 +111,9 @@ void lw_refigure_widget (Widget w, Boolean doit);
 Boolean lw_window_is_in_menubar (Window win, Widget menubar_widget);
 
 /* Manage resizing: TRUE permits resizing widget w; FALSE disallows it. */
-#ifndef USE_MOTIF
-ATTRIBUTE_CONST
-#endif
 void lw_allow_resizing (Widget w, Boolean flag);
 
 /* Set up the main window. */
-#ifndef USE_MOTIF
-ATTRIBUTE_CONST
-#endif
 void lw_set_main_areas (Widget parent,
                         Widget menubar,
                         Widget work_area);
diff --git a/src/emacs-module.c b/src/emacs-module.c
index 385c3089a9..956706cf9f 100644
--- a/src/emacs-module.c
+++ b/src/emacs-module.c
@@ -41,6 +41,11 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
 # pragma GCC diagnostic ignored "-Wclobbered"
 #endif
 
+/* This module is lackadaisical about function casts.  */
+#if GNUC_PREREQ (8, 0, 0)
+# pragma GCC diagnostic ignored "-Wcast-function-type"
+#endif
+
 /* We use different strategies for allocating the user-visible objects
    (struct emacs_runtime, emacs_env, emacs_value), depending on
    whether the user supplied the -module-assertions flag.  If