Skip to content

Commit ac0fb85

Browse files
committed
Fix errors and deprecation warnings
1 parent 8b47276 commit ac0fb85

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

REQUIRE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ BinDeps
33
@osx Homebrew
44
@windows WinRPM
55
DataStreams
6+
Compat
7+
LegacyStrings

deps/build.jl

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
using BinDeps
2+
using Compat
23

34
@BinDeps.setup
45

56
sqlite3_lib = library_dependency("sqlite3_lib", aliases = ["sqlite3","sqlite3-64","libsqlite3","libsqlite3-0"])
67

7-
@windows_only begin
8+
if is_windows()
89
using WinRPM
910
provides(WinRPM.RPM, "libsqlite3-0",sqlite3_lib, os = :Windows)
10-
end
11-
12-
@osx_only begin
13-
using Homebrew
14-
provides(Homebrew.HB, "sqlite", sqlite3_lib, os = :Darwin)
15-
end
16-
@unix_only begin
17-
provides(Yum, Dict("sqlite3-devel" => sqlite3_lib))
18-
provides(AptGet, Dict("sqlite3" => sqlite3_lib))
11+
elseif is_apple()
12+
using Homebrew
13+
provides(Homebrew.HB, "sqlite", sqlite3_lib, os = :Darwin)
14+
elseif is_linux()
15+
provides(Yum, Dict("sqlite3-devel" => sqlite3_lib))
16+
provides(AptGet, Dict("sqlite3" => sqlite3_lib))
1917
end
2018

2119
@BinDeps.install Dict(:sqlite3_lib => :sqlite3_lib)

src/SQLite.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ VERSION >= v"0.4.0-dev+6521" && __precompile__(true)
22
module SQLite
33

44
using DataStreams, DataFrames, WeakRefStrings, LegacyStrings
5+
import LegacyStrings: UTF16String
56

67
export Data, DataFrame
78

0 commit comments

Comments
 (0)