Skip to content

Commit 26536c5

Browse files
authored
Merge pull request #175 from swig-fortran/merge-4.1.1
Merge 4.1.1
2 parents 8b5d9c6 + b0ddd07 commit 26536c5

30 files changed

+1724
-1429
lines changed

.github/workflows/nuget.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: Windows Nuget Build
22

33
on:
44
push:
5+
branches: master
56
paths-ignore:
67
- 'CHANGES*'
78
- 'Doc/**'
@@ -13,6 +14,9 @@ on:
1314
- 'Doc/**'
1415
- 'appveyor.yml'
1516

17+
permissions:
18+
contents: read # to fetch code (actions/checkout)
19+
1620
jobs:
1721
build:
1822

ANNOUNCE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
*** ANNOUNCE: SWIG 4.1.0 (24 Oct 2022) ***
1+
*** ANNOUNCE: SWIG 4.1.1 (30 Nov 2022) ***
22

33
https://www.swig.org
44

5-
We're pleased to announce SWIG-4.1.0, the latest SWIG release.
5+
We're pleased to announce SWIG-4.1.1, the latest SWIG release.
66

77
What is SWIG?
88
=============
@@ -25,11 +25,11 @@ Availability
2525
============
2626
The release is available for download on Sourceforge at
2727

28-
https://prdownloads.sourceforge.net/swig/swig-4.1.0.tar.gz
28+
https://prdownloads.sourceforge.net/swig/swig-4.1.1.tar.gz
2929

3030
A Windows version is also available at
3131

32-
https://prdownloads.sourceforge.net/swig/swigwin-4.1.0.zip
32+
https://prdownloads.sourceforge.net/swig/swigwin-4.1.1.zip
3333

3434
Please report problems with this release to the swig-devel mailing list,
3535
details at https://www.swig.org/mail.html.

CCache/ccache.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -735,13 +735,15 @@ static void from_cache(int first)
735735
}
736736

737737
/* send the cpp stderr, if applicable */
738-
fd_cpp_stderr = open(cpp_stderr, O_RDONLY | O_BINARY);
739-
if (fd_cpp_stderr != -1) {
740-
copy_fd(fd_cpp_stderr, 2);
741-
close(fd_cpp_stderr);
742-
unlink(cpp_stderr);
743-
free(cpp_stderr);
744-
cpp_stderr = NULL;
738+
if (cpp_stderr) {
739+
fd_cpp_stderr = open(cpp_stderr, O_RDONLY | O_BINARY);
740+
if (fd_cpp_stderr != -1) {
741+
copy_fd(fd_cpp_stderr, 2);
742+
close(fd_cpp_stderr);
743+
unlink(cpp_stderr);
744+
free(cpp_stderr);
745+
cpp_stderr = NULL;
746+
}
745747
}
746748

747749
/* send the stderr */

CCache/mdfour.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ static void copy64(uint32 *M, const unsigned char *in)
8888
int i;
8989

9090
for (i=0;i<16;i++)
91-
M[i] = (in[i*4+3]<<24) | (in[i*4+2]<<16) |
92-
(in[i*4+1]<<8) | (in[i*4+0]<<0);
91+
M[i] = ((uint32)in[i*4+3]<<24) | ((uint32)in[i*4+2]<<16) |
92+
((uint32)in[i*4+1]<<8) | ((uint32)in[i*4+0]<<0);
9393
}
9494

9595
static void copy4(unsigned char *out,uint32 x)

0 commit comments

Comments
 (0)