Mercurial > octave-nkf
changeset 16314:0723ea02dcdb
use intptr_t instead of long
* lo-sysdep.cc (octave_popen2) Use intptr_t instead of long.
* kpse.cc (KPSE_DEBUG_FOPEN): Likewise.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 15 Mar 2013 04:14:09 -0400 |
| parents | 6aafe87a3144 |
| children | 62791b1f06cb |
| files | liboctave/system/lo-sysdep.cc liboctave/util/kpse.cc |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/system/lo-sysdep.cc Fri Mar 15 07:07:08 2013 -0400 +++ b/liboctave/system/lo-sysdep.cc Fri Mar 15 04:14:09 2013 -0400 @@ -114,8 +114,8 @@ pipeMode = PIPE_NOWAIT; SetNamedPipeHandleState (parentRead, &pipeMode, 0, 0); } - fildes[1] = _open_osfhandle (reinterpret_cast<long> (parentRead), _O_RDONLY | _O_BINARY); - fildes[0] = _open_osfhandle (reinterpret_cast<long> (parentWrite), _O_WRONLY | _O_BINARY); + fildes[1] = _open_osfhandle (reinterpret_cast<intptr_t> (parentRead), _O_RDONLY | _O_BINARY); + fildes[0] = _open_osfhandle (reinterpret_cast<intptr_t> (parentWrite), _O_WRONLY | _O_BINARY); si.dwFlags |= STARTF_USESTDHANDLES; si.hStdInput = childRead; si.hStdOutput = childWrite;
--- a/liboctave/util/kpse.cc Fri Mar 15 07:07:08 2013 -0400 +++ b/liboctave/util/kpse.cc Fri Mar 15 04:14:09 2013 -0400 @@ -364,7 +364,7 @@ if (KPSE_DEBUG_P (KPSE_DEBUG_FOPEN)) DEBUGF3 ("fopen (%s, %s) => 0x%lx\n", filename.c_str (), mode, - reinterpret_cast<unsigned long> (f)); + reinterpret_cast<intptr_t> (f)); return f; }