Mercurial > mxe-octave
annotate src/netcdf-1-fixes.patch @ 6359:b68148d8be7b
* src/mesa.mk: update to v22.1.5
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Wed, 10 Aug 2022 15:18:27 -0400 |
parents | 1b10dc73d928 |
children |
rev | line source |
---|---|
5871
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
1 From 9a8a2eb2694581f6caf103aee593ca9607be17bd Mon Sep 17 00:00:00 2001 |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
2 From: Milton Woods <miltonjwoods@gmail.com> |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
3 Date: Mon, 23 Aug 2021 14:22:57 +1000 |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
4 Subject: [PATCH] Fix path conversions for mingw-w64 |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
5 |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
6 --- |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
7 libdispatch/dpathmgr.c | 2 +- |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
8 1 file changed, 1 insertion(+), 1 deletion(-) |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
9 |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
10 diff --git a/libdispatch/dpathmgr.c b/libdispatch/dpathmgr.c |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
11 index eb450534e..6a5890423 100644 |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
12 --- a/libdispatch/dpathmgr.c |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
13 +++ b/libdispatch/dpathmgr.c |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
14 @@ -861,7 +861,7 @@ getlocalpathkind(void) |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
15 kind = NCPD_CYGWIN; |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
16 #elif __MSYS__ |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
17 kind = NCPD_MSYS; |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
18 -#elif _MSC_VER /* not _WIN32 */ |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
19 +#elif defined(_MSC_VER) || defined(__MINGW32__) /* not _WIN32 */ |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
20 kind = NCPD_WIN; |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
21 #else |
1b10dc73d928
netcdf: add patch for msys2 filenames
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
22 kind = NCPD_NIX; |