--- util/util.h.orig	2012-02-04 23:35:52.000000000 -0600
+++ util/util.h	2014-10-01 20:48:32.000000000 -0500
@@ -20,14 +20,22 @@
 #endif
 
 #ifndef SIZEOF_VOID_P
+#if __LP64__
+#define SIZEOF_VOID_P 8
+#else
 #define SIZEOF_VOID_P 4
 #endif
+#endif
 #ifndef SIZEOF_INT
 #define SIZEOF_INT 4
 #endif
 #ifndef SIZEOF_LONG
+#if __LP64__
+#define SIZEOF_LONG 8
+#else
 #define SIZEOF_LONG 4
 #endif
+#endif
 
 #if SIZEOF_VOID_P == 8 && SIZEOF_INT == 4
 typedef long util_ptrint;