Skip to content

Commit

Permalink
Merge pull request #175 from swig-fortran/merge-4.1.1
Browse files Browse the repository at this point in the history
Merge 4.1.1
  • Loading branch information
sethrj authored Dec 2, 2022
2 parents 8b5d9c6 + b0ddd07 commit 26536c5
Show file tree
Hide file tree
Showing 30 changed files with 1,724 additions and 1,429 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: Windows Nuget Build

on:
push:
branches: master
paths-ignore:
- 'CHANGES*'
- 'Doc/**'
Expand All @@ -13,6 +14,9 @@ on:
- 'Doc/**'
- 'appveyor.yml'

permissions:
contents: read # to fetch code (actions/checkout)

jobs:
build:

Expand Down
8 changes: 4 additions & 4 deletions ANNOUNCE
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
*** ANNOUNCE: SWIG 4.1.0 (24 Oct 2022) ***
*** ANNOUNCE: SWIG 4.1.1 (30 Nov 2022) ***

https://www.swig.org

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

What is SWIG?
=============
Expand All @@ -25,11 +25,11 @@ Availability
============
The release is available for download on Sourceforge at

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

A Windows version is also available at

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

Please report problems with this release to the swig-devel mailing list,
details at https://www.swig.org/mail.html.
Expand Down
16 changes: 9 additions & 7 deletions CCache/ccache.c
Original file line number Diff line number Diff line change
Expand Up @@ -735,13 +735,15 @@ static void from_cache(int first)
}

/* send the cpp stderr, if applicable */
fd_cpp_stderr = open(cpp_stderr, O_RDONLY | O_BINARY);
if (fd_cpp_stderr != -1) {
copy_fd(fd_cpp_stderr, 2);
close(fd_cpp_stderr);
unlink(cpp_stderr);
free(cpp_stderr);
cpp_stderr = NULL;
if (cpp_stderr) {
fd_cpp_stderr = open(cpp_stderr, O_RDONLY | O_BINARY);
if (fd_cpp_stderr != -1) {
copy_fd(fd_cpp_stderr, 2);
close(fd_cpp_stderr);
unlink(cpp_stderr);
free(cpp_stderr);
cpp_stderr = NULL;
}
}

/* send the stderr */
Expand Down
4 changes: 2 additions & 2 deletions CCache/mdfour.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ static void copy64(uint32 *M, const unsigned char *in)
int i;

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

static void copy4(unsigned char *out,uint32 x)
Expand Down
Loading

0 comments on commit 26536c5

Please sign in to comment.