diff options
| author | Jamey Hicks <jamey.hicks@nokia.com> | 2012-09-27 13:53:46 -0400 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-12 19:50:42 +0200 |
| commit | 97cf5a258307a48394ea5e0c1565640f953915d8 (patch) | |
| tree | 62bd994e5809259dc4a97286f34801a3d5415bc4 /src/hbtree/hbtree_p.h | |
| parent | 6396dad6cc27208817a6ee416c539f08477dcc6c (diff) | |
adapt hbtree to windows
Change-Id: I1aef5540cebd859572fb6640e03442e5c2416ee4
Reviewed-by: Kevin Simons <kevin.b.simons@gmail.com>
Diffstat (limited to 'src/hbtree/hbtree_p.h')
| -rw-r--r-- | src/hbtree/hbtree_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/hbtree/hbtree_p.h b/src/hbtree/hbtree_p.h index 2e0f2f3..dd9b7ff 100644 --- a/src/hbtree/hbtree_p.h +++ b/src/hbtree/hbtree_p.h @@ -53,7 +53,11 @@ #include <QSharedPointer> #include <QStack> +#ifndef Q_OS_WIN32 #define HBTREE_ATTRIBUTE_PACKED __attribute__((packed)) +#else +#define HBTREE_ATTRIBUTE_PACKED +#endif class HBtreePrivate { @@ -217,7 +221,9 @@ public: quint32 size; // size of file at time of commit quint32 flags; // If marker has this, it was synced. } HBTREE_ATTRIBUTE_PACKED; +#ifndef Q_OS_WIN32 Q_STATIC_ASSERT(sizeof(Meta) == 28); +#endif Meta meta; QSet<quint32> residueHistory; // history nodes that don't have a home. usable after sync. quint32 overflowPage; |