psid64/gcc461.patch

   1 diff -aur psid64-0.8/include/sidplay/sidint.h psid64-0.8-patched//include/sidplay/sidint.h
   2 --- psid64-0.8/include/sidplay/sidint.h 2007-02-24 20:27:20.000000000 +0100
   3 +++ psid64-0.8-patched//include/sidplay/sidint.h        2011-08-02 06:54:48.335780430 +0200
   4 @@ -2,7 +2,7 @@
   5  #define _INCLUDE_SIDPLAY_SIDINT_H 1
   6  #ifndef _GENERATED_STDINT_H
   7  #define _GENERATED_STDINT_H "psid64 0.8"
   8 -/* generated using a gnu compiler version gcc (GCC) 4.1.1 20070105 (Red Hat 4.1.1-51) Copyright (C) 2006 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */
   9 +/* generated using a gnu compiler version gcc (GCC) 4.6.1 Copyright (C) 2011 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */
  10
  11  #include <stdint.h>
  12
  13 diff -aur psid64-0.8/src/ConsoleApp.cpp psid64-0.8-patched//src/ConsoleApp.cpp
  14 --- psid64-0.8/src/ConsoleApp.cpp       2006-10-15 12:26:33.000000000 +0200
  15 +++ psid64-0.8-patched//src/ConsoleApp.cpp      2011-08-02 07:09:43.595755399 +0200
  16 @@ -38,6 +38,7 @@
  17  #endif
  18
  19  #include <sstream>
  20 +#include <stdlib.h>
  21
  22  using std::cerr;
  23  using std::cout;
  24 diff -aur psid64-0.8/src/libpsid64/psid64.cpp psid64-0.8-patched//src/libpsid64/psid64.cpp
  25 --- psid64-0.8/src/libpsid64/psid64.cpp 2007-02-05 22:48:16.000000000 +0100
  26 +++ psid64-0.8-patched//src/libpsid64/psid64.cpp        2011-08-02 07:04:14.335765106 +0200
  27 @@ -421,14 +421,14 @@
  28  Psid64::save(const char* fileName)
  29  {
  30      // Open binary output file stream.
  31 -    openmode createAttr = std::ios::out;
  32 +       std::ios_base::openmode createAttr = std::ios::out;
  33  #if defined(HAVE_IOS_BIN)
  34      createAttr |= std::ios::bin;
  35  #else
  36      createAttr |= std::ios::binary;
  37  #endif
  38
  39 -    ofstream outfile(fileName, createAttr);
  40 +       ofstream outfile(fileName, createAttr);
  41      return write(outfile);
  42  }
  43
  44 diff -aur psid64-0.8/src/sidtune/SidTune.cpp psid64-0.8-patched//src/sidtune/SidTune.cpp
  45 --- psid64-0.8/src/sidtune/SidTune.cpp  2006-10-21 09:35:35.000000000 +0200
  46 +++ psid64-0.8-patched//src/sidtune/SidTune.cpp 2011-08-02 07:08:11.082423596 +0200
  47 @@ -291,7 +291,7 @@
  48      uint_least32_t fileLen = 0;
  49
  50      // This sucks big time
  51 -    openmode createAtrr = std::ios::in;
  52 +       std::ios_base::openmode createAtrr = std::ios::in;
  53  #ifdef HAVE_IOS_NOCREATE
  54      createAtrr |= std::ios::nocreate;
  55  #endif
  56 @@ -958,7 +958,7 @@
  57      if ( status )
  58      {
  59          // Open binary output file stream.
  60 -        openmode createAttr = std::ios::out;
  61 +               std::ios_base::openmode createAttr = std::ios::out;
  62  #if defined(HAVE_IOS_BIN)
  63          createAttr |= std::ios::bin;
  64  #else
  65 @@ -1008,7 +1008,7 @@
  66      if ( status )
  67      {
  68          // Open ASCII output file stream.
  69 -        openmode createAttr = std::ios::out;
  70 +               std::ios_base::openmode createAttr = std::ios::out;
  71          if ( overWriteFlag )
  72              createAttr |= std::ios::trunc;
  73          else
  74 @@ -1042,7 +1042,7 @@
  75      if ( status )
  76      {
  77          // Open binary output file stream.
  78 -        openmode createAttr = std::ios::out;
  79 +               std::ios_base::openmode createAttr = std::ios::out;
  80  #if defined(HAVE_IOS_BIN)
  81          createAttr |= std::ios::bin;
  82  #else
  83 @@ -1052,7 +1052,7 @@
  84              createAttr |= std::ios::trunc;
  85          else
  86              createAttr |= std::ios::app;
  87 -        std::ofstream fMyOut( fileName, createAttr );
  88 +         std::ofstream fMyOut( fileName, createAttr );
  89          if ( !fMyOut || fMyOut.tellp()>0 )
  90          {
  91              info.statusString = SidTune::txt_cantCreateFile;