]> granicus.if.org Git - libevent/commitdiff
Merge branch 'fix-struct-linger'
authorAzat Khuzhin <a3at.mail@gmail.com>
Sun, 29 Jan 2017 20:07:40 +0000 (23:07 +0300)
committerAzat Khuzhin <a3at.mail@gmail.com>
Sun, 29 Jan 2017 20:07:40 +0000 (23:07 +0300)
@jbech
  "Accidentally disabled by 0dda56a due to confusion between struct
  linger vs. SO_LINGER and #define vs. AC_DEFINE. Try adding synthetic
  #error test to confirm."

* fix-struct-linger:
  cmake: check for 'struct linger' existence
  test/bench*: prefix event-config.h macros after 0dda56a48e94
  test/bench_httpclient: restore SO_LINGER usage after 0dda56a48e94

Fixes: #444 (original pull-request)

Trivial merge