Changeset 20f2ad6 in git


Ignore:
Timestamp:
Apr 11, 2016, 4:20:05 PM (8 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')
Children:
9ef321bcdf1ec45cb2df3f22b14b2a6c67306895
Parents:
eb2441e1193ae7d6b2e60ac81be41870be2ed94d
Message:
fix: problem with sig_chld_hdl for glibc 2.22
Location:
Singular
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Singular/fevoices.cc

    reb2441 r20f2ad6  
    593593    else if (currentVoice->sw==BI_file)
    594594    {
     595      fseek(currentVoice->files,currentVoice->ftellptr,SEEK_SET);
    595596      s=fgets(currentVoice->buffer+offset,(MAX_FILE_BUFFER-1-sizeof(ADDRESS))-offset,
    596597              currentVoice->files);
     598      if (s!=NULL) currentVoice->ftellptr=ftell(currentVoice->files);
    597599    }
    598600    //else /* BI_buffer */ s==NULL  => return 0
  • Singular/fevoices.h

    reb2441 r20f2ad6  
    6868    char * buffer;        // buffer pointer
    6969    long   fptr;          // current position in buffer
     70    long   ftellptr;      // with glibc 2.22, file position gets lost
     71                          // in sig_chld_hdl (ssi:ffork link), see examples/waitall.sing
    7072
    7173    int    start_lineno;  // lineno, to restore in recursion
Note: See TracChangeset for help on using the changeset viewer.