annotate src/stable-octave-1-fixes.patch @ 3520:0c0aea0ab1bb

avoid popen macro in stable-octave
author John W. Eaton <jwe@octave.org>
date Fri, 14 Feb 2014 18:00:12 -0500
parents
children f285f1a665d4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3520
0c0aea0ab1bb avoid popen macro in stable-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff -ur a/libinterp/corefcn/file-io.cc b/libinterp/corefcn/file-io.cc
0c0aea0ab1bb avoid popen macro in stable-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- a/libinterp/corefcn/file-io.cc 2014-01-08 01:39:44.000000000 -0500
0c0aea0ab1bb avoid popen macro in stable-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ b/libinterp/corefcn/file-io.cc 2014-02-14 17:31:58.816756036 -0500
0c0aea0ab1bb avoid popen macro in stable-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -1801,7 +1801,7 @@
0c0aea0ab1bb avoid popen macro in stable-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 return retval;
0c0aea0ab1bb avoid popen macro in stable-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 }
0c0aea0ab1bb avoid popen macro in stable-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7
0c0aea0ab1bb avoid popen macro in stable-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 -DEFUN (popen, args, ,
0c0aea0ab1bb avoid popen macro in stable-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 +DEFUNX ("popen", Fpopen, args, ,
0c0aea0ab1bb avoid popen macro in stable-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 "-*- texinfo -*-\n\
0c0aea0ab1bb avoid popen macro in stable-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 @deftypefn {Built-in Function} {@var{fid} =} popen (@var{command}, @var{mode})\n\
0c0aea0ab1bb avoid popen macro in stable-octave
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 Start a process and create a pipe. The name of the command to run is\n\