mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-02-07 08:55:42 +00:00
Code Issues Projects Releases Wiki Activity

merge sourceforge repo

Browse Source
This commit is contained in:
Mischa Spiegelmock
2016-08-02 19:32:39 -07:00
parent c11d04ecb5 ec243eaa5a
commit 3d64545dc8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libprojectM/Common.hpp
View File

@ -63,7 +63,7 @@ extern FILE *fmemopen(void *buf, size_t len, const char *pMode);
#ifdef LINUX
#include <cstdlib>
#define projectM_isnan isnan
#define projectM_isnan std::isnan
#endif
#ifdef EMSCRIPTEN

10
src/libprojectM/MilkdropPresetFactory/Parser.cpp
View File

@ -1410,7 +1410,7 @@ PerFrameEqn * Parser::parse_implicit_per_frame_eqn(std::istream & fs, char * pa
PerFrameEqn * per_frame_eqn;
GenExpr * gen_expr;
if (fs == NULL)
if (fs.fail())
return NULL;
if (param_string == NULL)
return NULL;
@ -1565,7 +1565,7 @@ InitCond * Parser::parse_per_frame_init_eqn(std::istream & fs, MilkdropPreset *
if (preset == NULL)
return NULL;
if (fs == NULL)
if (fs.fail())
return NULL;
if ((token = parseToken(fs, name)) != tEq)
@ -1879,7 +1879,7 @@ int Parser::parse_shapecode(char * token, std::istream & fs, MilkdropPreset * p
/* Null argument checks */
if (preset == NULL)
return PROJECTM_FAILURE;
if (fs == NULL)
if (fs.fail())
return PROJECTM_FAILURE;
if (token == NULL)
return PROJECTM_FAILURE;
@ -2170,7 +2170,7 @@ int Parser::parse_wave(char * token, std::istream & fs, MilkdropPreset * preset
if (token == NULL)
return PROJECTM_FAILURE;
if (fs == NULL)
if (fs.fail())
return PROJECTM_FAILURE;
if (preset == NULL)
return PROJECTM_FAILURE;
@ -2352,7 +2352,7 @@ int Parser::parse_shape(char * token, std::istream & fs, MilkdropPreset * prese
if (token == NULL)
return PROJECTM_FAILURE;
if (fs == NULL)
if (fs.fail())
return PROJECTM_FAILURE;
if (preset == NULL)
return PROJECTM_FAILURE;