Merge commit 'HEAD'; branch 'master' into buffersize

2 files changed, 2 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index d5f8c0f..a93a097 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ BINDIR	= $(prefix)/bin
 MANDIR	= $(prefix)/share/man/man1
 
 CC	:= gcc
-CFLAGS	:= $(CFLAGS) -W -Wall -pipe -D_USE_SOURCE -DVERSION="\"$(VERSION)\"" \
+CFLAGS	:= $(CFLAGS) -pipe -D_USE_SOURCE -DVERSION="\"$(VERSION)\"" -W -Wall \
 	   -Wstrict-prototypes -Wsign-compare -Wshadow -Wchar-subscripts \
 	   -Wmissing-declarations -Wpointer-arith -Wcast-align -Wmissing-prototypes
 
diff --git a/inotail.c b/inotail.c
index 4664a62..fc021dd 100644
--- a/inotail.c
+++ b/inotail.c
@@ -513,7 +513,7 @@ int main(int argc, char **argv)
 
 	files = malloc(n_files * sizeof(struct file_struct));
 	if (unlikely(!files)) {
-		fprintf(stderr, "Error: Could not allocate memory (%s)\n", strerror(errno));
+		fprintf(stderr, "Error: Failed to allocate memory (%s)\n", strerror(errno));
 		exit(EXIT_FAILURE);
 	}