diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac.in | 1 | ||||
| -rw-r--r-- | src/cycle.c | 2 | ||||
| -rw-r--r-- | src/misc.h | 6 | ||||
| -rw-r--r-- | src/mypixmap.c | 2 | ||||
| -rw-r--r-- | src/netwm.c | 2 |
6 files changed, 13 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 0da25ab46..a689f2768 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,7 @@ @SET_MAKE@ +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + EXTRA_DIST = \ example.gtkrc-2.0 \ intltool-extract.in \ diff --git a/configure.ac.in b/configure.ac.in index a9f951c68..fb06b5770 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -32,6 +32,7 @@ Written for Xfce by Olivier Fourdan <fourdan@xfce.org>.]) AC_INIT([xfwm4], [xfwm4_version], [xfce4-dev@xfce.org]) AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip]) +AC_CONFIG_MACRO_DIRS([m4]) AC_CONFIG_HEADERS([config.h]) AM_MAINTAINER_MODE() diff --git a/src/cycle.c b/src/cycle.c index eb32a8684..60488c4f8 100644 --- a/src/cycle.c +++ b/src/cycle.c @@ -282,7 +282,7 @@ clientCycleEventFilter (XEvent * xevent, gpointer data) if ((removed = myScreenGetClientFromWindow (screen_info, ((XDestroyWindowEvent *) xevent)->window, SEARCH_WINDOW)) == NULL) break; /* No need to go any further */ gone |= (c == removed); - /* Walk through */ + FALLTHROUGH; case UnmapNotify: status = EVENT_FILTER_CONTINUE; if (!removed && (removed = myScreenGetClientFromWindow (screen_info, ((XUnmapEvent *) xevent)->window, SEARCH_WINDOW)) == NULL) diff --git a/src/misc.h b/src/misc.h index 2416b7d3b..96fb0d021 100644 --- a/src/misc.h +++ b/src/misc.h @@ -33,6 +33,12 @@ #include <glib.h> #include "screen.h" +#if defined (__GNUC__) && __GNUC__ >= 7 +#define FALLTHROUGH __attribute__ ((fallthrough)) +#else +#define FALLTHROUGH +#endif + /* Just for completion, being a bit pedantic, X seems to be missing those so far, so create them for now. diff --git a/src/mypixmap.c b/src/mypixmap.c index 7d84e6fb1..334f159a0 100644 --- a/src/mypixmap.c +++ b/src/mypixmap.c @@ -492,11 +492,13 @@ file_buffer (enum buf_op op, gpointer handle) break; } /* Fall through to the next xpm_seek_char. */ + FALLTHROUGH; case op_cmap: xpm_seek_char (h->infile, '"'); fseek (h->infile, -1, SEEK_CUR); /* Fall through to the xpm_read_string. */ + FALLTHROUGH; case op_body: if(!xpm_read_string (h->infile, &h->buffer, &h->buffer_size)) diff --git a/src/netwm.c b/src/netwm.c index 12a220ee2..bc354c67b 100644 --- a/src/netwm.c +++ b/src/netwm.c @@ -692,7 +692,7 @@ clientNetMoveResize (Client * c, XClientMessageEvent * ev) break; case NET_WM_MOVERESIZE_CANCEL: FLAG_UNSET (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING); - /* Walk through */ + FALLTHROUGH; default: /* Do nothing */ return; break; |