Merge branch 'maint'

* maint:
  Add separate counter "called for preprocessing"
  Include strerror(errno) in error messages when system calls fail

Conflicts:
	ccache.c

diff --cc ccache.c
index 93e07062ed7c460c240826bf59575d2ca347c4ed,8a036805ee98633bfd8fefd269458fbea689b91d..01178630362bbd1baaf2d6bbae155deda86619ec
--- 1/ccache.c
--- 2/ccache.c
+++ b/ccache.c
@@@ -344,16 -306,8 +344,16 @@@ remember_include_file(char *path, size_
                goto ignore;
        }
  
 +#ifdef _WIN32
 +      /* stat fails on directories on win32 */
 +      attributes = GetFileAttributes(path);
 +      if (attributes != INVALID_FILE_ATTRIBUTES &&
 +          attributes & FILE_ATTRIBUTE_DIRECTORY)
 +              goto ignore;
 +#endif
 +
        if (stat(path, &st) != 0) {
-               cc_log("Failed to stat include file %s", path);
+               cc_log("Failed to stat include file %s: %s", path, strerror(errno));
                goto failure;
        }
        if (S_ISDIR(st.st_mode)) {

diff --cc ccache.h
Simple merge

diff --cc execute.c
Simple merge

diff --cc stats.c
Simple merge

diff --cc test.sh
Simple merge

diff --cc test/test_argument_processing.c
Simple merge