Ignore:
Timestamp:
Oct 22, 2015, 9:48:01 AM (9 years ago)
Author:
dkearney
Message:

merging r5799 and r5800 (rpExec functions for matlab and octave) from trunk to 1.4 branch

Location:
branches/1.4
Files:
2 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/1.4

  • branches/1.4/lang/matlab/Makefile.in

    r1944 r5918  
    6666                rpUnitsGetUnits$(EXT) \
    6767                rpUnitsGetUnitsName$(EXT) \
    68                 rpUtilsProgress$(EXT)
     68                rpUtilsProgress$(EXT) \
     69                rpExec$(EXT)
    6970
    7071# MEX can't be run in parallel since it generates temporary files
    … …  
    7576
    7677.SUFFIXES: .cc $(EXT)
     78
     79.c$(EXT):
     80        $(MEX) $(MEX_FLAGS) $<
    7781
    7882.cc$(EXT):

  • branches/1.4/lang/matlab/rpExec.c

    r5799 r5918  
    7676   char           *stdoutBuffer;
    7777   char           *stderrBuffer;
    78 
    79    pipe(stdoutPipe);
    80    pipe(stderrPipe);
     78   int             error;
     79
     80   error = pipe(stdoutPipe);
     81   error = pipe(stderrPipe);
    8182
    8283   if((pid = fork()) < 0) {
Note: See TracChangeset for help on using the changeset viewer.