From dev-return-69104-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Tue Apr 24 02:06:07 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id D9733180634 for ; Tue, 24 Apr 2018 02:06:06 +0200 (CEST) Received: (qmail 22759 invoked by uid 500); 24 Apr 2018 00:06:05 -0000 Mailing-List: contact dev-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list dev@zookeeper.apache.org Received: (qmail 22748 invoked by uid 99); 24 Apr 2018 00:06:05 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Apr 2018 00:06:05 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0F9BEE0628; Tue, 24 Apr 2018 00:06:05 +0000 (UTC) From: andschwa To: dev@zookeeper.apache.org Reply-To: dev@zookeeper.apache.org Message-ID: Subject: [GitHub] zookeeper pull request #505: ZOOKEEPER-3025: Make `hashtable` search `includ... Content-Type: text/plain Date: Tue, 24 Apr 2018 00:06:05 +0000 (UTC) GitHub user andschwa opened a pull request: https://github.com/apache/zookeeper/pull/505 ZOOKEEPER-3025: Make `hashtable` search `include` When ZOOKEEPER-2999 removed the directory side-effect of `include_directories(include)`, and added it as a target-level include to the `zookeeper` library, this broke the Windows build. It worked on Linux (where the patch was tested) because `winconfig.h` and is not included, but on Windows, the `hashtable` library included `winconfig.h` (found in `include`) but no longer knew where to find it. The fix is to add `include` to the `hashtable` library's list of include directories. You can merge this pull request into a Git repository by running: $ git pull https://github.com/andschwa/zookeeper ZOOKEEPER-3025 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/zookeeper/pull/505.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #505 ---- commit 69afce4df5a5cc71999d67c87578e236b58d17a1 Author: Andrew Schwartzmeyer Date: 2018-04-23T23:38:03Z ZOOKEEPER-3025: Make `hashtable` search `include` When ZOOKEEPER-2999 removed the directory side-effect of `include_directories(include)`, and added it as a target-level include to the `zookeeper` library, this broke the Windows build. It worked on Linux (where the patch was tested) because `winconfig.h` and is not included, but on Windows, the `hashtable` library included `winconfig.h` (found in `include`) but no longer knew where to find it. The fix is to add `include` to the `hashtable` library's list of include directories. ---- ---