ext/swift.h in swift-0.5.1 vs ext/swift.h in swift-0.6.0

@@ -15,21 +15,29 @@
 extern VALUE eSwiftRuntimeError;
 extern VALUE eSwiftConnectionError;
 
 #define CATCH_DBI_EXCEPTIONS() \
   catch (dbi::ConnectionError &error) { \
-    rb_raise(eSwiftConnectionError, "%s", CSTRING(rb_str_new2(error.what()))); \
+    rb_raise(eSwiftConnectionError, "%s", error.what()); \
   } \
   catch (dbi::Error &error) { \
-    rb_raise(eSwiftRuntimeError, "%s", CSTRING(rb_str_new2(error.what()))); \
+    rb_raise(eSwiftRuntimeError, "%s", error.what()); \
   }
 
 #include "adapter.h"
 #include "iostream.h"
 #include "query.h"
 #include "result.h"
 #include "statement.h"
 #include "request.h"
 #include "pool.h"
 
+#undef SIZET2NUM
+#ifdef HAVE_LONG_LONG
+  #define SIZET2NUM(x) ULL2NUM(x)
+  #define DAYMICROSECS 86400000000LL
+#else
+  #define SIZET2NUM(x) ULONG2NUM(x)
+  #define DAYMICROSECS 86400000000L
 #endif
 
+#endif