From: Joel Rosdahl <joel@rosdahl.net>
Date: Thu, 9 Aug 2012 13:10:36 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v3.2~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02f9e065390ee7505be1d35af9c6dab10a23e492;p=thirdparty%2Fccache.git

Merge branch 'maint'

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

Conflicts:
	manifest.c
---

02f9e065390ee7505be1d35af9c6dab10a23e492
diff --cc manifest.c
index fc605037a,7f02ede0c..5da269ae1
--- a/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. */