contrib/src/projectM/gcc6.patch

   1 diff -ruN projectM-2.0.1-Source.old/Common.hpp projectM-2.0.1-Source/Common.hpp
   2 --- projectM-2.0.1-Source.old/Common.hpp        2016-08-06 10:57:57.678183788 +0200
   3 +++ projectM-2.0.1-Source/Common.hpp    2016-08-06 11:01:06.714192806 +0200
   4 @@ -55,7 +55,7 @@
   5
   6  #ifdef LINUX
   7  #include <cstdlib>
   8 -#define projectM_isnan isnan
   9 +#define projectM_isnan std::isnan
  10
  11  #endif
  12
  13 diff -ruN projectM-2.0.1-Source.old/MilkdropPresetFactory/Parser.cpp projectM-2.0.1-Source/MilkdropPresetFactory/Parser.cpp
  14 --- projectM-2.0.1-Source.old/MilkdropPresetFactory/Parser.cpp  2016-08-06 10:57:57.690183788 +0200
  15 +++ projectM-2.0.1-Source/MilkdropPresetFactory/Parser.cpp      2016-08-06 10:58:47.634186171 +0200
  16 @@ -1405,7 +1405,7 @@
  17    PerFrameEqn * per_frame_eqn;
  18    GenExpr * gen_expr;
  19
  20 -  if (fs == NULL)
  21 +  if (fs.fail())
  22      return NULL;
  23    if (param_string == NULL)
  24      return NULL;
  25 @@ -1560,7 +1560,7 @@
  26
  27    if (preset == NULL)
  28      return NULL;
  29 -  if (fs == NULL)
  30 +  if (fs.fail())
  31      return NULL;
  32
  33    if ((token = parseToken(fs, name)) != tEq)
  34 @@ -1874,7 +1874,7 @@
  35    /* Null argument checks */
  36    if (preset == NULL)
  37      return PROJECTM_FAILURE;
  38 -  if (fs == NULL)
  39 +  if (fs.fail())
  40      return PROJECTM_FAILURE;
  41    if (token == NULL)
  42      return PROJECTM_FAILURE;
  43 @@ -2165,7 +2165,7 @@
  44
  45    if (token == NULL)
  46      return PROJECTM_FAILURE;
  47 -  if (fs == NULL)
  48 +  if (fs.fail())
  49      return PROJECTM_FAILURE;
  50    if (preset == NULL)
  51      return PROJECTM_FAILURE;
  52 @@ -2347,7 +2347,7 @@
  53    if (token == NULL)
  54
  55      return PROJECTM_FAILURE;
  56 -  if (fs == NULL)
  57 +  if (fs.fail())
  58      return PROJECTM_FAILURE;
  59    if (preset == NULL)
  60      return PROJECTM_FAILURE;