Skip to content

Commit c0e3ffb

Browse files
zbeekmanzbeekman
authored
Merge pull request #553 from sourceryinstitute/issue-550-errno-fix
Fix #550: conflicting types for `_errno`
2 parents 81f1114 + fb39966 commit c0e3ffb

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

‎src/tests/unit/iso-fortran-binding/ISO_Fortran_binding_tests.c

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ int main (void)
5050
int ind;
5151
size_t base_type;
5252
size_t base_type_size;
53-
size_t errno;
53+
size_t iso_errno;
5454

5555
/* Test function establish. */
5656
/* Fresh descriptor, base address is NULL. */
@@ -77,7 +77,7 @@ int main (void)
7777
/* Loop through rank. */
7878
for (int k = 0; k <= CFI_MAX_RANK; k++)
7979
{
80-
errno = 1;
80+
iso_errno = 1;
8181
rank = k;
8282
CFI_CDESC_T (rank) test1;
8383
/* We do this because C sometimes doesn't make the structures with
@@ -154,7 +154,7 @@ int main (void)
154154
/* Loop through rank. */
155155
for (int k = 0; k <= CFI_MAX_RANK; k++)
156156
{
157-
errno = 1;
157+
iso_errno = 1;
158158
rank = k;
159159
if (extents != NULL)
160160
{
@@ -284,7 +284,7 @@ int main (void)
284284
/* Loop through rank. */
285285
for (int k = 0; k <= CFI_MAX_RANK; k++)
286286
{
287-
errno = 1;
287+
iso_errno = 1;
288288
rank = k;
289289
if (extents != NULL)
290290
{
@@ -358,7 +358,7 @@ int main (void)
358358
}
359359

360360
rank = 1;
361-
errno = 1;
361+
iso_errno = 1;
362362
CFI_CDESC_T (rank) test4;
363363
base_type = type[3] & CFI_type_mask;
364364
base_type_size = (type[3] - base_type) >> CFI_type_kind_shift;
@@ -373,7 +373,7 @@ int main (void)
373373
}
374374

375375
rank = 1;
376-
errno = 1;
376+
iso_errno = 1;
377377
CFI_CDESC_T (rank) test5;
378378
base_type = type[3] & CFI_type_mask;
379379
base_type_size = (type[3] - base_type) >> CFI_type_kind_shift;
@@ -389,7 +389,7 @@ int main (void)
389389

390390
/* Test CFI_deallocate. */
391391
rank = 1;
392-
errno = 1;
392+
iso_errno = 1;
393393
base_type = type[3] & CFI_type_mask;
394394
base_type_size = (type[3] - base_type) >> CFI_type_kind_shift;
395395
for (int i = 1; i <= 3; i++)
@@ -434,7 +434,7 @@ int main (void)
434434
attribute = i;
435435
for (int j = 0; j <= 4; j++)
436436
{
437-
errno = 1;
437+
iso_errno = 1;
438438
rank = j;
439439
if (extents != NULL)
440440
{
@@ -529,7 +529,7 @@ int main (void)
529529
/* Loop through rank. */
530530
for (int k = 1; k <= CFI_MAX_RANK; k++)
531531
{
532-
errno = 1;
532+
iso_errno = 1;
533533
rank = k;
534534
CFI_CDESC_T (rank) source;
535535
if (extents != NULL)
@@ -616,7 +616,7 @@ int main (void)
616616
for (int i = 0; i < CFI_MAX_RANK; i++)
617617
{
618618
rank = i;
619-
errno = 1;
619+
iso_errno = 1;
620620
base_type = type[3] & CFI_type_mask;
621621
base_type_size = (type[3] - base_type) >> CFI_type_kind_shift;
622622
attribute = CFI_attribute_other;
@@ -643,7 +643,7 @@ int main (void)
643643
{
644644
extents[r] = r + 2;
645645
}
646-
ind = CFI_establish ((CFI_cdesc_t *) &test8b, &errno, attribute, type[3],
646+
ind = CFI_establish ((CFI_cdesc_t *) &test8b, &iso_errno, attribute, type[3],
647647
base_type_size, rank, extents);
648648
ind = CFI_setpointer ((CFI_cdesc_t *) &test8a, (CFI_cdesc_t *) &test8b,
649649
lower);
@@ -684,7 +684,7 @@ int main (void)
684684

685685
/* NULL source. */
686686
rank = 10;
687-
errno = 1;
687+
iso_errno = 1;
688688
base_type = type[3] & CFI_type_mask;
689689
base_type_size = (type[3] - base_type) >> CFI_type_kind_shift;
690690
CFI_CDESC_T (rank) test9;
@@ -719,7 +719,7 @@ int main (void)
719719
}
720720

721721
rank = 3;
722-
errno = 1;
722+
iso_errno = 1;
723723
attribute = CFI_attribute_other;
724724
CFI_CDESC_T (rank) test10a, test10b;
725725
if (extents != NULL)
@@ -747,7 +747,7 @@ int main (void)
747747
}
748748
base_type = CFI_type_double & CFI_type_mask;
749749
base_type_size = (CFI_type_double - base_type) >> CFI_type_kind_shift;
750-
ind = CFI_establish ((CFI_cdesc_t *) &test10b, &errno, attribute,
750+
ind = CFI_establish ((CFI_cdesc_t *) &test10b, &iso_errno, attribute,
751751
CFI_type_double, base_type_size, rank, extents);
752752
ind = CFI_setpointer ((CFI_cdesc_t *) &test10a, (CFI_cdesc_t *) &test10b,
753753
lower);
@@ -757,14 +757,14 @@ int main (void)
757757
return 1;
758758
}
759759

760-
errno = 1;
760+
iso_errno = 1;
761761
base_type = CFI_type_other & CFI_type_mask;
762762
base_type_size = 666;
763763
ind = CFI_establish ((CFI_cdesc_t *) &test10a, &ind, attribute,
764764
CFI_type_other, base_type_size, rank, extents);
765765
base_type = CFI_type_other & CFI_type_mask;
766766
base_type_size = 69;
767-
ind = CFI_establish ((CFI_cdesc_t *) &test10b, &errno, attribute,
767+
ind = CFI_establish ((CFI_cdesc_t *) &test10b, &iso_errno, attribute,
768768
CFI_type_other, base_type_size, rank, extents);
769769
ind = CFI_setpointer ((CFI_cdesc_t *) &test10a, (CFI_cdesc_t *) &test10b,
770770
lower);
@@ -774,7 +774,7 @@ int main (void)
774774
return 1;
775775
}
776776

777-
errno = 1;
777+
iso_errno = 1;
778778
base_type = type[3] & CFI_type_mask;
779779
base_type_size = (CFI_type_long - base_type) >> CFI_type_kind_shift;
780780
ind = CFI_establish ((CFI_cdesc_t *) &test10a, &ind, attribute, type[3],
@@ -798,7 +798,7 @@ int main (void)
798798
}
799799
base_type = CFI_type_other & CFI_type_mask;
800800
base_type_size = (CFI_type_long - base_type) >> CFI_type_kind_shift;
801-
ind = CFI_establish ((CFI_cdesc_t *) &test10c, &errno, attribute, type[3],
801+
ind = CFI_establish ((CFI_cdesc_t *) &test10c, &iso_errno, attribute, type[3],
802802
base_type_size, rank, extents);
803803
ind = CFI_setpointer ((CFI_cdesc_t *) &test10a, (CFI_cdesc_t *) &test10c,
804804
lower);
@@ -847,7 +847,7 @@ int main (void)
847847
/* Loop through rank. */
848848
for (int k = 1; k <= CFI_MAX_RANK; k++)
849849
{
850-
errno = 1;
850+
iso_errno = 1;
851851
rank = k;
852852
CFI_CDESC_T (rank) section, source;
853853
if (extents != NULL)
@@ -1010,7 +1010,7 @@ int main (void)
10101010
next_type2:;
10111011
}
10121012

1013-
errno = 1;
1013+
iso_errno = 1;
10141014
rank = 1;
10151015
CFI_CDESC_T (rank) section, source;
10161016
if (extents != NULL)
@@ -1089,7 +1089,7 @@ int main (void)
10891089
CFI_CDESC_T (0) section2, source2;
10901090
ind = CFI_establish ((CFI_cdesc_t *) &source2, &ind, CFI_attribute_other,
10911091
type[3], 0, 0, NULL);
1092-
ind = CFI_establish ((CFI_cdesc_t *) &section2, &errno, CFI_attribute_other,
1092+
ind = CFI_establish ((CFI_cdesc_t *) &section2, &iso_errno, CFI_attribute_other,
10931093
type[3], 0, 0, NULL);
10941094
ind = CFI_section ((CFI_cdesc_t *) &section2, (CFI_cdesc_t *) &source2, lower,
10951095
upper, strides);
@@ -1133,7 +1133,7 @@ int main (void)
11331133

11341134
for (int i = 1; i < CFI_MAX_RANK; i++)
11351135
{
1136-
errno = 1;
1136+
iso_errno = 1;
11371137
rank = i;
11381138
int ctr = 0;
11391139
CFI_CDESC_T (rank) source;
@@ -1233,7 +1233,7 @@ int main (void)
12331233
}
12341234

12351235
/* CFI_section negative strides. */
1236-
errno = 1;
1236+
iso_errno = 1;
12371237
rank = 8;
12381238
if (extents != NULL)
12391239
{

0 commit comments

Comments
 (0)