You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2017/05/11 19:58:36 UTC

arrow git commit: ARROW-1003: [C++] Check flag _WIN32 instead of __WIN32

Repository: arrow
Updated Branches:
  refs/heads/master 3f22b5f76 -> c10b7d798


ARROW-1003: [C++] Check flag _WIN32 instead of __WIN32

__WIN32 is not standard for all windows compilers.

Author: bgosztonyi <b....@gmail.com>

Closes #669 from bgosztonyi/patch-1 and squashes the following commits:

618ab3e [bgosztonyi] _WIN32 instead of __WIN32


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/c10b7d79
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/c10b7d79
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/c10b7d79

Branch: refs/heads/master
Commit: c10b7d798bfcd1e47d8f3dc6a5bdff2047f34293
Parents: 3f22b5f
Author: bgosztonyi <b....@gmail.com>
Authored: Thu May 11 15:58:31 2017 -0400
Committer: Wes McKinney <we...@twosigma.com>
Committed: Thu May 11 15:58:31 2017 -0400

----------------------------------------------------------------------
 cpp/src/arrow/io/hdfs-internal.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/c10b7d79/cpp/src/arrow/io/hdfs-internal.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/io/hdfs-internal.cc b/cpp/src/arrow/io/hdfs-internal.cc
index e67419b..8b4a92b 100644
--- a/cpp/src/arrow/io/hdfs-internal.cc
+++ b/cpp/src/arrow/io/hdfs-internal.cc
@@ -69,7 +69,7 @@ static std::vector<fs::path> get_potential_libhdfs_paths() {
   std::string file_name;
 
 // OS-specific file name
-#ifdef __WIN32
+#ifdef _WIN32
   file_name = "hdfs.dll";
 #elif __APPLE__
   file_name = "libhdfs.dylib";
@@ -103,7 +103,7 @@ static std::vector<fs::path> get_potential_libhdfs3_paths() {
   std::string file_name;
 
 // OS-specific file name
-#ifdef __WIN32
+#ifdef _WIN32
   file_name = "hdfs3.dll";
 #elif __APPLE__
   file_name = "libhdfs3.dylib";