Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: crystal-lang/crystal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b5e46dbebf33
Choose a base ref
...
head repository: crystal-lang/crystal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4a754e9e4067
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 16, 2016

  1. Merge branch 'release/0.18' of github.com:crystal-lang/crystal into r… 

    …elease/0.18
    Ary Borenszweig committed Jun 16, 2016
    Copy the full SHA
    68cae2b View commit details

  2. Fix printf call for LibSSL/LibCrypto

    @jhass
    jhass committed Jun 16, 2016
    Copy the full SHA
    8a67433 View commit details

  3. Merge branch 'release/0.18'

    @jhass
    jhass committed Jun 16, 2016
    Copy the full SHA
    4a754e9 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/openssl/lib_crypto.cr
  2. +1 −1 src/openssl/lib_ssl.cr
2 changes: 1 addition & 1 deletion src/openssl/lib_crypto.cr
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@[Link(ldflags: "`pkg-config --libs libcrypto || printf '-lcrypto'`")]
@[Link(ldflags: "`pkg-config --libs libcrypto || printf %s '-lcrypto'`")]
lib LibCrypto
alias Char = LibC::Char
alias Int = LibC::Int
2 changes: 1 addition & 1 deletion src/openssl/lib_ssl.cr
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require "./lib_crypto"

@[Link(ldflags: "`pkg-config --libs libssl || printf '-lssl -lcrypto'`")]
@[Link(ldflags: "`pkg-config --libs libssl || printf %s '-lssl -lcrypto'`")]
lib LibSSL
alias Int = LibC::Int
alias Char = LibC::Char