[setup - the official Cygwin setup program] branch master, updated. release_2.893-3-ge084ed3

jturney-9JcytcrH/[email protected]
Newsgroups gmane.os.cygwin.cvs.apps
Message-ID <[email protected]>


https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=e084ed380e29d07e3dca3e43f30342e6d2a4f674

commit e084ed380e29d07e3dca3e43f30342e6d2a4f674
Author: Jon Turney <[email protected]>
Date:   Wed Jul 18 13:01:47 2018 +0100

    Remove unused IDI_SPIN
    
    Added in 713bbe5f, but never actually used

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=a5027692b1d07e8dbe1a9bfc3289a5d6deb54bc6

commit a5027692b1d07e8dbe1a9bfc3289a5d6deb54bc6
Author: Jon Turney <[email protected]>
Date:   Mon Jul 16 12:27:15 2018 +0100

    Remove unused choose-rtarrow.bmp
    
    Usused since replaced by tree-plus.bmp/tree-minus.bmp in 82306ac2

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=d86d832b06ebae2796433643716d1e2bf8752fe3

commit d86d832b06ebae2796433643716d1e2bf8752fe3
Author: Jon Turney <[email protected]>
Date:   Sat Jul 28 23:57:17 2018 +0100

    Properly identify Win32 systems which support IsWow64Process2()
    
    Properly identify Win32 systems which support IsWow64Process2() (Windows 10
    version 1511 (TH2) or later) in the default user-agent string.


Diff:
---
 Makefile.am        |    1 -
 choose-rtarrow.bmp |  Bin 106 -> 0 bytes
 nio-ie5.cc         |    3 +++
 resource.h         |    1 -
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0c27529..7bd7c57 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,6 @@ EXTRA_DIST = \
 	check-na.bmp \
 	check-no.bmp \
 	check-yes.bmp \
-	choose-rtarrow.bmp \
 	choose-spin.bmp \
 	cygwin.ico \
 	cygwin-setup.ico \
diff --git a/choose-rtarrow.bmp b/choose-rtarrow.bmp
deleted file mode 100644
index 5f719e1..0000000
Binary files a/choose-rtarrow.bmp and /dev/null differ
diff --git a/nio-ie5.cc b/nio-ie5.cc
index 6202c01..8786774 100644
--- a/nio-ie5.cc
+++ b/nio-ie5.cc
@@ -65,6 +65,9 @@ determine_default_useragent(void)
       (pfnIsWow64Process2(GetCurrentProcess(), &processMachine, &nativeMachine))) {
     switch (nativeMachine)
       {
+      case IMAGE_FILE_MACHINE_I386:
+        bitness = "Win32";
+        break;
       case IMAGE_FILE_MACHINE_AMD64:
         bitness = "WoW64";
         break;
diff --git a/resource.h b/resource.h
index 04a68fd..421a24c 100644
--- a/resource.h
+++ b/resource.h
@@ -82,7 +82,6 @@
 
 // icons
 
-#define IDI_SPIN                          400
 #define IDI_CYGWIN_SETUP                  401
 #define IDI_CYGWIN                        402
 #define IDI_CYGWIN_TERMINAL               403
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.