From 54f982815ea7398997bc6e61023a2379cec81acb Mon Sep 17 00:00:00 2001
From: John Esmet <john.esmet@gmail.com>
Date: Fri, 18 Jul 2014 14:50:29 -0400
Subject: [PATCH] FT-304 Remove inconsistent 'struct' keyword which made the
osx build sad.
---
ft/ft-internal.h | 2 +-
ft/serialize/ft-serialize.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ft/ft-internal.h b/ft/ft-internal.h
index e6214df4d9..fb04cd1bd9 100644
--- a/ft/ft-internal.h
+++ b/ft/ft-internal.h
@@ -225,7 +225,7 @@ struct ft {
// These are not read-only:
// protected by blocktable lock
- struct block_table blocktable;
+ block_table blocktable;
// protected by atomic builtins
STAT64INFO_S in_memory_stats;
diff --git a/ft/serialize/ft-serialize.h b/ft/serialize/ft-serialize.h
index 856d32d549..05957d70f6 100644
--- a/ft/serialize/ft-serialize.h
+++ b/ft/serialize/ft-serialize.h
@@ -92,7 +92,7 @@ PATENT RIGHTS GRANT:
#include "ft/serialize/block_table.h"
size_t toku_serialize_ft_size(struct ft_header *h);
-void toku_serialize_ft_to(int fd, struct ft_header *h, struct block_table *blocktable, CACHEFILE cf);
+void toku_serialize_ft_to(int fd, struct ft_header *h, block_table *bt, CACHEFILE cf);
void toku_serialize_ft_to_wbuf(struct wbuf *wbuf, struct ft_header *h, DISKOFF translation_location_on_disk, DISKOFF translation_size_on_disk);
void toku_serialize_descriptor_contents_to_fd(int fd, DESCRIPTOR desc, DISKOFF offset);
void toku_serialize_descriptor_contents_to_wbuf(struct wbuf *wb, DESCRIPTOR desc);
--
2.30.9