Merge commit '3d78a08b9f3307ac3874f5c120f7d4166c62efb9'

2014-09-10 15:02:09 +09:00 · 2014-09-10 15:02:09 +09:00 · a80c27ba33
parent 3ab1d6f348 3d78a08b9f
commit a80c27ba33
2 changed files with 4 additions and 1 deletions
--- a/sqlite3.go
+++ b/sqlite3.go
@ -6,6 +6,9 @@
 package sqlite3

 /*
+#ifdef _WIN32
+# define _localtime32(x) localtime(x)
+#endif
 #include <sqlite3.h>
 #include <stdlib.h>
 #include <string.h>
--- a/sqlite3_windows.go
+++ b/sqlite3_windows.go
@ -7,7 +7,7 @@ package sqlite3

 /*
 #cgo CFLAGS: -I. -fno-stack-check -fno-stack-protector -mno-stack-arg-probe
-#cgo LDFLAGS: -lmingwex -lmingw32 -lmsvcr100
+#cgo LDFLAGS: -lmingwex -lmingw32
 #cgo CFLAGS: -DSQLITE_ENABLE_RTREE
 */
 import "C"