Merge pull request #141 from haberman/defcleanup

Major refactoring/cleanup of upb

1 files changed, 2 insertions, 2 deletions

diff --git a/upb/msg.c b/upb/msg.c
index c6f0c17..b46d41c 100644
--- a/upb/msg.c
+++ b/upb/msg.c
@@ -1,4 +1,6 @@
 
+#include <string.h>
+#include "upb/table.int.h"
 #include "upb/msg.h"
 #include "upb/structs.int.h"
 
@@ -15,8 +17,6 @@ bool upb_fieldtype_mapkeyok(upb_fieldtype_t type) {
 
 /** upb_msgval ****************************************************************/
 
-#define upb_alignof(t) offsetof(struct { char c; t x; }, x)
-
 /* These functions will generate real memcpy() calls on ARM sadly, because
  * the compiler assumes they might not be aligned. */