diff options
| author | David Hows <david.hows@mongodb.com> | 2016-06-24 17:05:13 +1000 |
|---|---|---|
| committer | David Hows <david.hows@mongodb.com> | 2016-06-24 17:05:13 +1000 |
| commit | d8fb874fc40989cb9675e56ca80b3b64e6fa2ee3 (patch) | |
| tree | 6f03ed5cde97aedc762215c14d23ee5305998a2b /test/format/format.h | |
| parent | fb1663e6fc800be97c0ddc697b6f939dc610e08e (diff) | |
| parent | 1f4aaa4490a82cf947afdabbb9214ee5b1850d13 (diff) | |
Merge branch 'develop' of github.com:wiredtiger/wiredtiger into mongodb-3.4mongodb-3.3.9mongodb-3.3.10mongodb-3.0.1
Diffstat (limited to 'test/format/format.h')
| -rw-r--r-- | test/format/format.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/test/format/format.h b/test/format/format.h index 8fd9b113311..ad5f408ac30 100644 --- a/test/format/format.h +++ b/test/format/format.h @@ -33,12 +33,6 @@ #include <db.h> #endif -#if defined(__GNUC__) -#define WT_GCC_ATTRIBUTE(x) __attribute__(x) -#else -#define WT_GCC_ATTRIBUTE(x) -#endif - #define EXTPATH "../../ext/" /* Extensions path */ #define LZ4_PATH \ @@ -266,7 +260,7 @@ typedef struct { #define TINFO_COMPLETE 2 /* Finished */ #define TINFO_JOINED 3 /* Resolved */ volatile int state; /* state */ -} TINFO WT_GCC_ATTRIBUTE((aligned(WT_CACHE_LINE_ALIGNMENT))); +} TINFO WT_COMPILER_TYPE_ALIGN(WT_CACHE_LINE_ALIGNMENT); #ifdef HAVE_BERKELEY_DB void bdb_close(void); |