Merge pull request #55 from JuliaLang/sjk/libc-libdl

Compat for Libc and Libdl

Author: jakebolewski

README.md

@@ -72,10 +72,12 @@ Currently, the `@compat` macro supports the following syntaxes:
 
 * `@inline` and `@noinline` have been added. On 0.3, these are "no-ops," meaning they don't actually do anything.
 
-## Other syntax changes
+## Other changes
 
 * `Dict(ks, vs)` is now `Dict(zip(ks, vs))` [#8521](https://github.com/JuliaLang/julia/pull/8521)
 
+* Libc and dynamic library-related functions have been moved to the Libc and Libdl modules [#10328](https://github.com/JuliaLang/julia/pull/10328)
+
 ## Nullable type
 * [`Nullable` types](http://julia.readthedocs.org/en/latest/manual/types/?highlight=nullable#nullable-types-representing-missing-values) and their associated operations.
 

src/Compat.jl

@@ -263,4 +263,28 @@ if VERSION < v"0.4.0-dev+656"
     include("nullable.jl")
 end
 
+if VERSION < v"0.4.0-dev+3844"
+    @eval module Libc
+        const FILE = Base.CFILE
+        const calloc = Base.c_calloc
+        const free = Base.c_free
+        const malloc = Base.c_malloc
+        const realloc = Base.c_realloc
+        using Base: munmap, systemsleep
+        export FILE, MS_ASYNC, MS_INVALIDATE, MS_SYNC, TmStruct, calloc, errno,
+               flush_cstdio, free, gethostname, getpid, malloc, mmap, msync,
+               munmap, realloc, strerror, strftime, strptime, systemsleep,
+               time
+    end
+    @eval module Libdl
+        using Base.Sys: dlext, dllist, dlpath
+        export DL_LOAD_PATH, RTLD_DEEPBIND, RTLD_FIRST, RTLD_GLOBAL, RTLD_LAZY,
+               RTLD_LOCAL, RTLD_NODELETE, RTLD_NOLOAD, RTLD_NOW, dlclose, dlext,
+               dllist, dlopen, dlopen_e, dlpath, dlsym, dlsym_e, find_library
+    end
+    export Libc, Libdl
+else
+    import Base: Libc, Libdl
+end
+
 end # module

test/runtests.jl

@@ -159,3 +159,11 @@ end
 @test parse(Int16, "1101", 2) == convert(Int16, 13)
 @test parse(Float64, "222") == 222.0
 @test parse(Float32, "1.1") == convert(Float32, 1.1)
+
+# Make sure exports from Libc and Libdl are defined
+for x in [:strftime,:systemsleep,:getpid,:FILE,:malloc,:MS_SYNC,:munmap,:flush_cstdio,:realloc,:strptime,:Libc,:errno,:msync,:TmStruct,:calloc,:MS_INVALIDATE,:MS_ASYNC,:time,:strerror,:gethostname,:free,:mmap]
+    Libc.(x)
+end
+for x in [:RTLD_LOCAL,:RTLD_GLOBAL,:find_library,:dlsym,:RTLD_LAZY,:RTLD_NODELETE,:DL_LOAD_PATH,:RTLD_NOW,:Libdl,:dlext,:dlsym_e,:RTLD_FIRST,:dlopen,:dllist,:dlpath,:RTLD_NOLOAD,:dlclose,:dlopen_e,:RTLD_DEEPBIND]
+    Libdl.(x)
+end