emulators/gpsim/patches/patch-src_processor.cc

   1 $NetBSD: patch-src_processor.cc,v 1.1 2011/12/19 15:52:21 wiz Exp $
   2
   3 Add missing include.
   4 Avoid conflict with C++ list<>.
   5
   6 --- src/processor.cc.orig       2011-02-16 06:38:31.000000000 +0000
   7 +++ src/processor.cc
   8 @@ -733,11 +733,11 @@ void Processor::read_src_files(void)
   9
  10  //-------------------------------------------------------------------
  11  //
  12 -// processor -- list
  13 +// processor -- plist
  14  //
  15  // Display the contents of either a source or list file
  16  //
  17 -void Processor::list(unsigned int file_id,
  18 +void Processor::plist(unsigned int file_id,
  19                       unsigned int pc_val,
  20                       int start_line,
  21                       int end_line)
  22 @@ -2346,7 +2346,7 @@ void FileContext::ReadSource(void)
  23    line_seek.resize(max_line()+1);
  24    pm_address.resize(max_line()+1);
  25
  26 -  std::rewind(fptr);
  27 +  ::rewind(fptr);
  28
  29    char buf[256],*s;
  30    line_seek[0] = 0;