Merge branch 'maint'

* maint:
  Rename static_assert macro to avoid clash with any preexisting static_assert

Conflicts:
	manifest.c

diff --cc manifest.c
index fc605037a0130c0a863dce25e6cab20183143a0a,7f02ede0c574d865801b2267e7f6cab9c1be1e81..5da269ae1cfaa07a11f19037a811a5c460a60558
--- 1/manifest.c
--- 2/manifest.c
+++ b/manifest.c
@@@ -66,7 -66,8 +66,8 @@@ static const uint32_t MAGIC = 0x63436d4
  static const uint8_t  VERSION = 0;
  static const uint32_t MAX_MANIFEST_ENTRIES = 100;
  
- #define static_assert(e) do { enum { static_assert__ = 1/(e) }; } while (false)
+ #define ccache_static_assert(e) \
 -      do { enum { ccache_static_assert__ = 1/(e) }; } while (0)
++      do { enum { ccache_static_assert__ = 1/(e) }; } while (false)
  
  struct file_info {
        /* Index to n_files. */