Mercurial > mxe-octave
changeset 3525:7e203439d0a9
stable-octave, octave: fix gnulib gethostname bug w64 on systems
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 16 Feb 2014 18:02:15 -0500 |
| parents | 8a4a11234ccf |
| children | 60cd6f076a3d |
| files | src/octave-1-fixes.patch src/stable-octave-2-fixes.patch |
| diffstat | 2 files changed, 22 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/octave-1-fixes.patch Sun Feb 16 18:02:15 2014 -0500 @@ -0,0 +1,11 @@ +--- a/libgnu/unistd.in.h 2013-11-26 03:43:39.000000000 -0500 ++++ b/libgnu/unistd.in.h 2014-02-16 16:21:36.254338221 -0500 +@@ -714,7 +714,7 @@ + Null terminate it if the name is shorter than LEN. + If the host name is longer than LEN, set errno = EINVAL and return -1. + Return 0 if successful, otherwise set errno and return -1. */ +-# if @UNISTD_H_HAVE_WINSOCK2_H@ ++# if !@HAVE_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef gethostname + # define gethostname rpl_gethostname
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/stable-octave-2-fixes.patch Sun Feb 16 18:02:15 2014 -0500 @@ -0,0 +1,11 @@ +--- a/libgnu/unistd.in.h 2013-11-26 03:43:39.000000000 -0500 ++++ b/libgnu/unistd.in.h 2014-02-16 16:21:36.254338221 -0500 +@@ -714,7 +714,7 @@ + Null terminate it if the name is shorter than LEN. + If the host name is longer than LEN, set errno = EINVAL and return -1. + Return 0 if successful, otherwise set errno and return -1. */ +-# if @UNISTD_H_HAVE_WINSOCK2_H@ ++# if !@HAVE_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) + # undef gethostname + # define gethostname rpl_gethostname