Mercurial > pub > dyncall > dyncall

changeset 454:68d98455a8bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
suite_aggrs: var scope change for older compilers; excluding msvc from tests with empty structs
author Tassilo Philipp
date Thu, 27 Jan 2022 14:48:51 +0100
parents c497b87552f6
children 68733edd9bd1
files test/suite_aggrs/cases.c test/suite_aggrs/main.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/test/suite_aggrs/cases.c	Thu Jan 27 12:58:50 2022 +0100
+++ b/test/suite_aggrs/cases.c	Thu Jan 27 14:48:51 2022 +0100
@@ -48,7 +48,7 @@
 
 #include "dyncall.h"
 
-#if defined(DC__OS_Plan9)
+#if defined(DC__C_MSVC) || defined(DC__OS_Plan9)
 /* Plan9 pcc does not allow empty structs */
 #  include "nonemptystructs.h"
 #else
--- a/test/suite_aggrs/main.c	Thu Jan 27 12:58:50 2022 +0100
+++ b/test/suite_aggrs/main.c	Thu Jan 27 14:48:51 2022 +0100
@@ -93,12 +93,13 @@
       case '{': {
         /* find struct sig */
         int len;
+        DCstruct *st;
         int i = find_agg_idx(&len, sig);
         if(i == -1) {
           printf("unknown sig at '%s' ;", sig);
           return 0;
         }
-        DCstruct *st = ((DCstruct*(*)())G_agg_touchdcstfuncs[i])();
+        st = ((DCstruct*(*)())G_agg_touchdcstfuncs[i])();
         dcArgStruct(p, st, K_a[pos]);
         sig += len-1; /* advance to next arg char */
         break;