[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 39e4aad778699793e7a4136552e28e11e7a2f3ec

[Michael B. <mdb...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".

The branch, master has been updated
       via  39e4aad778699793e7a4136552e28e11e7a2f3ec (commit)
      from  fbce397f3b8868807899bbd73fb2329fe5c46958 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 39e4aad778699793e7a4136552e28e11e7a2f3ec
Author: Michael Black W9MDB <mdb...@ya...>
Date:   Thu Jan 21 12:04:46 2021 -0600

    Another attempt to get testrigcaps to recognize compiler differences

diff --git a/tests/testrigcaps.c b/tests/testrigcaps.c
index e1d2eae1..947c0ecc 100644
--- a/tests/testrigcaps.c
+++ b/tests/testrigcaps.c
@@ -13,10 +13,10 @@ int main()
     void *p2 = &rig->state.vfo_list;
     unsigned long offset = p2 - p1;
     printf("offset vfo_list=%ld\n", offset);
-#if defined(__MINGW32__)
-    int expected = 10144; // mingw32
-#elif defined(__MINGW64__)
+#if defined(WIN64) || defined (_WIN64) || defined (__WIN64__)
     int expected = 13264; // mingw64
+#elif defined(WIN32) || defined (_WIN32) || defined(__WIN32__)
+    int expected = 10144; // mingw32
 #else
     int expected = 13280; // should be most 64-bit compilers
 #endif
@@ -32,10 +32,10 @@ int main()
     offset = p2 - p1;
     printf("offset power_max=%ld\n", offset);
 
-#if defined(__MINGW32__)
-    expected = 10448; // mingw32
-#elif defined(__MINGW64__)
+#if defined(WIN64) || defined (_WIN64) || defined (__WIN64__)
     expected = 13664; // mingw64
+#elif defined(WIN32) || defined (_WIN32) || defined(__WIN32__)
+    expected = 10448; // mingw32
 #else
     expected = 13696;
 #endif

-----------------------------------------------------------------------

Summary of changes:
 tests/testrigcaps.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Hamlib -- Ham radio control libraries