[newlib-cygwin] Cygwin: Drop looking for w32api in winsup/w32api

Jon TURNEY jturney@sourceware.org
Wed Oct 14 14:40:14 GMT 2020


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=08e7ee19122a7d2ce1a5caf5fd065ac1e36a6838

commit 08e7ee19122a7d2ce1a5caf5fd065ac1e36a6838
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Sep 25 20:59:14 2020 +0100

    Cygwin: Drop looking for w32api in winsup/w32api
    
    Stop looking for w32api headers in the (no longer existent)
    winsup/w32api directory (removed in commit 61746d6ae850).

Diff:
---
 winsup/acinclude.m4         | 2 --
 winsup/configure            | 2 --
 winsup/cygserver/aclocal.m4 | 2 --
 winsup/cygserver/configure  | 2 --
 winsup/cygwin/aclocal.m4    | 2 --
 winsup/cygwin/configure     | 2 --
 winsup/utils/aclocal.m4     | 2 --
 winsup/utils/configure      | 2 --
 8 files changed, 16 deletions(-)

diff --git a/winsup/acinclude.m4 b/winsup/acinclude.m4
index 80c920e8c..865ef8b5d 100644
--- a/winsup/acinclude.m4
+++ b/winsup/acinclude.m4
@@ -50,8 +50,6 @@ if test -n "$with_windows_headers"; then
     else
 	AC_MSG_ERROR([cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers]);
     fi
-elif test -d "$winsup_srcdir/w32api/include/windef.h"; then
-    windows_headers="$winsup_srcdir/w32api/include"
 else
     windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd)
     if test -z "$windows_headers" -o ! -d "$windows_headers"; then
diff --git a/winsup/configure b/winsup/configure
index a66c34585..384403050 100755
--- a/winsup/configure
+++ b/winsup/configure
@@ -3430,8 +3430,6 @@ if test -n "$with_windows_headers"; then
     else
 	as_fn_error $? "cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers" "$LINENO" 5;
     fi
-elif test -d "$winsup_srcdir/w32api/include/windef.h"; then
-    windows_headers="$winsup_srcdir/w32api/include"
 else
     windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd)
     if test -z "$windows_headers" -o ! -d "$windows_headers"; then
diff --git a/winsup/cygserver/aclocal.m4 b/winsup/cygserver/aclocal.m4
index 5bf14e574..4c041613d 100644
--- a/winsup/cygserver/aclocal.m4
+++ b/winsup/cygserver/aclocal.m4
@@ -64,8 +64,6 @@ if test -n "$with_windows_headers"; then
     else
 	AC_MSG_ERROR([cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers]);
     fi
-elif test -d "$winsup_srcdir/w32api/include/windef.h"; then
-    windows_headers="$winsup_srcdir/w32api/include"
 else
     windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd)
     if test -z "$windows_headers" -o ! -d "$windows_headers"; then
diff --git a/winsup/cygserver/configure b/winsup/cygserver/configure
index 71d1592f4..6de9ed0d4 100755
--- a/winsup/cygserver/configure
+++ b/winsup/cygserver/configure
@@ -3431,8 +3431,6 @@ if test -n "$with_windows_headers"; then
     else
 	as_fn_error $? "cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers" "$LINENO" 5;
     fi
-elif test -d "$winsup_srcdir/w32api/include/windef.h"; then
-    windows_headers="$winsup_srcdir/w32api/include"
 else
     windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd)
     if test -z "$windows_headers" -o ! -d "$windows_headers"; then
diff --git a/winsup/cygwin/aclocal.m4 b/winsup/cygwin/aclocal.m4
index c48aad01d..4adb9c03d 100644
--- a/winsup/cygwin/aclocal.m4
+++ b/winsup/cygwin/aclocal.m4
@@ -63,8 +63,6 @@ if test -n "$with_windows_headers"; then
     else
 	AC_MSG_ERROR([cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers]);
     fi
-elif test -d "$winsup_srcdir/w32api/include/windef.h"; then
-    windows_headers="$winsup_srcdir/w32api/include"
 else
     windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd)
     if test -z "$windows_headers" -o ! -d "$windows_headers"; then
diff --git a/winsup/cygwin/configure b/winsup/cygwin/configure
index f655f5738..d89ed8a2f 100755
--- a/winsup/cygwin/configure
+++ b/winsup/cygwin/configure
@@ -3442,8 +3442,6 @@ if test -n "$with_windows_headers"; then
     else
 	as_fn_error $? "cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers" "$LINENO" 5;
     fi
-elif test -d "$winsup_srcdir/w32api/include/windef.h"; then
-    windows_headers="$winsup_srcdir/w32api/include"
 else
     windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd)
     if test -z "$windows_headers" -o ! -d "$windows_headers"; then
diff --git a/winsup/utils/aclocal.m4 b/winsup/utils/aclocal.m4
index c48aad01d..4adb9c03d 100644
--- a/winsup/utils/aclocal.m4
+++ b/winsup/utils/aclocal.m4
@@ -63,8 +63,6 @@ if test -n "$with_windows_headers"; then
     else
 	AC_MSG_ERROR([cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers]);
     fi
-elif test -d "$winsup_srcdir/w32api/include/windef.h"; then
-    windows_headers="$winsup_srcdir/w32api/include"
 else
     windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd)
     if test -z "$windows_headers" -o ! -d "$windows_headers"; then
diff --git a/winsup/utils/configure b/winsup/utils/configure
index 32f75d6e0..4408c9f91 100755
--- a/winsup/utils/configure
+++ b/winsup/utils/configure
@@ -3137,8 +3137,6 @@ if test -n "$with_windows_headers"; then
     else
 	as_fn_error $? "cannot find windef.h in specified --with-windows-headers path: $saw_windows_headers" "$LINENO" 5;
     fi
-elif test -d "$winsup_srcdir/w32api/include/windef.h"; then
-    windows_headers="$winsup_srcdir/w32api/include"
 else
     windows_headers=$(cd $($ac_cv_prog_CC -xc /dev/null -E -include windef.h 2>/dev/null | sed -n 's%^# 1 "\([^"]*\)/windef\.h".*$%\1%p' | head -n1) 2>/dev/null && pwd)
     if test -z "$windows_headers" -o ! -d "$windows_headers"; then


More information about the Cygwin-cvs mailing list