From e59ad777d34cfee20b3b700482b936c16cceaa8e Mon Sep 17 00:00:00 2001
From: Sitsofe Wheeler <sitsofe@yahoo.com>
Date: Mon, 26 Mar 2018 15:50:03 +0100
Subject: [PATCH 1/1] configure/Makefile: make Cygwin force less

Continue the work started in commit
ca205a752c3d6ebe7de74a3dfe81808e48a502e3 ("configure: Make Cygwin take
regular configure path") by removing the forceful setting of flags that
are automatically detected anyway.

Even CONFIG_64BIT_LLP64 is unneeded because despite their names
CONFIG_32BIT/CONFIG_64BIT are only used to control the size's of words
and the regular configure path correctly detects CONFIG_32BIT for 64 bit
Windows even though it's LLP64.

Signed-off-by: Sitsofe Wheeler <sitsofe@yahoo.com>
---
 Makefile  |  3 ---
 configure | 11 -----------
 2 files changed, 14 deletions(-)

diff --git a/Makefile b/Makefile
index d45ba6b5..5ab79234 100644
--- a/Makefile
+++ b/Makefile
@@ -59,9 +59,6 @@ ifdef CONFIG_LIBHDFS
   SOURCE += engines/libhdfs.c
 endif
 
-ifdef CONFIG_64BIT_LLP64
-  CFLAGS += -DBITS_PER_LONG=32
-endif
 ifdef CONFIG_64BIT
   CFLAGS += -DBITS_PER_LONG=64
 endif
diff --git a/configure b/configure
index b3638807..a5c0f6ef 100755
--- a/configure
+++ b/configure
@@ -332,10 +332,6 @@ CYGWIN*)
       cc="x86_64-w64-mingw32-gcc"
     fi
   fi
-  if test ! -z "$build_32bit_win" && test "$build_32bit_win" = "yes"; then
-    output_sym "CONFIG_32BIT"
-  else
-    output_sym "CONFIG_64BIT_LLP64"
 
   target_win_ver=$(echo "$target_win_ver" | tr '[:lower:]' '[:upper:]')
   if test -z "$target_win_ver"; then
@@ -357,9 +353,6 @@ CYGWIN*)
   # We now take the regular configuration path without having exit 0 here.
   # Flags below are still necessary mostly for MinGW.
   socklen_t="yes"
-  sfaa="yes"
-  sync_sync="yes"
-  cmp_swap="yes"
   rusage_thread="yes"
   fdatasync="yes"
   clock_gettime="yes" # clock_monotonic probe has dependency on this
@@ -367,11 +360,7 @@ CYGWIN*)
   gettimeofday="yes"
   sched_idle="yes"
   tcp_nodelay="yes"
-  tls_thread="yes"
-  static_assert="yes"
   ipv6="yes"
-  mkdir_two="no"
-  echo "BUILD_CFLAGS=$CFLAGS -include config-host.h -D_GNU_SOURCE" >> $config_host_mak
   ;;
 esac
 
-- 
2.25.1