Mercurial > mxe-octave

annotate src/release-octave-1-gnulib.patch @ 5339:25a483af6aa7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/build-cmake.mk, src/cmake.mk: update to v3.16.5
author John Donoghue
date Thu, 05 Mar 2020 12:55:24 -0500
parents db215107402f
children 039563087c70
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4245
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff -uNr a/libgnu/unistd.in.h b/libgnu/unistd.in.h
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- a/libgnu/unistd.in.h 2016-06-18 18:47:32.000000000 -0400
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ b/libgnu/unistd.in.h 2016-06-23 18:45:42.410781867 -0400
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -734,7 +734,7 @@
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 Null terminate it if the name is shorter than LEN.
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 If the host name is longer than LEN, set errno = EINVAL and return -1.
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 Return 0 if successful, otherwise set errno and return -1. */
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 -# if @UNISTD_H_HAVE_WINSOCK2_H@
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 +# if !@HAVE_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 # undef gethostname
e622765c49c7 Update stable-octave package for 4.2.0 release.
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 # define gethostname rpl_gethostname
5278
db215107402f Add lseek patch for gnulib
John Donoghue <john.donoghue@ieee.org>
parents: 4748
diff changeset
13
db215107402f Add lseek patch for gnulib
John Donoghue <john.donoghue@ieee.org>
parents: 4748
diff changeset
14 diff -u a/libgnu/lseek.c b/libgnu/lseek.c
db215107402f Add lseek patch for gnulib
John Donoghue <john.donoghue@ieee.org>
parents: 4748
diff changeset
15 --- a/libgnu/lseek.c 2020-01-25 23:41:47.321133728 -0500
db215107402f Add lseek patch for gnulib
John Donoghue <john.donoghue@ieee.org>
parents: 4748
diff changeset
16 +++ b/libgnu/lseek.c 2020-01-25 23:43:05.587623161 -0500
db215107402f Add lseek patch for gnulib
John Donoghue <john.donoghue@ieee.org>
parents: 4748
diff changeset
17 @@ -63,7 +63,7 @@
db215107402f Add lseek patch for gnulib
John Donoghue <john.donoghue@ieee.org>
parents: 4748
diff changeset
18 return -1;
db215107402f Add lseek patch for gnulib
John Donoghue <john.donoghue@ieee.org>
parents: 4748
diff changeset
19 }
db215107402f Add lseek patch for gnulib
John Donoghue <john.donoghue@ieee.org>
parents: 4748
diff changeset
20 #endif
db215107402f Add lseek patch for gnulib
John Donoghue <john.donoghue@ieee.org>
parents: 4748
diff changeset
21 -#if _GL_WINDOWS_64_BIT_OFF_T
db215107402f Add lseek patch for gnulib
John Donoghue <john.donoghue@ieee.org>
parents: 4748
diff changeset
22 +#if _GL_WINDOWS_64_BIT_OFF_T || (defined __MINGW32__ && defined _FILE_OFFSET_BITS && (_FILE_OFFSET_BITS == 64))
db215107402f Add lseek patch for gnulib
John Donoghue <john.donoghue@ieee.org>
parents: 4748
diff changeset
23 return _lseeki64 (fd, offset, whence);
db215107402f Add lseek patch for gnulib
John Donoghue <john.donoghue@ieee.org>
parents: 4748
diff changeset
24 #else
db215107402f Add lseek patch for gnulib
John Donoghue <john.donoghue@ieee.org>
parents: 4748
diff changeset
25 return lseek (fd, offset, whence)