--- oscar/SleepLib/common.h.orig 2019-04-24 12:18:33.000000000 -0700 +++ oscar/SleepLib/common.h 2020-02-14 01:00:27.000000000 -0700 @@ -121,11 +121,6 @@ } } - -#ifndef nullptr -#define nullptr NULL -#endif - #ifdef TEST_BUILD const QString STR_TestBuild = "-Testing"; #else --- oscar/Graphs/glcommon.h.orig 2019-04-24 12:18:33.000000000 -0700 +++ oscar/Graphs/glcommon.h 2020-02-14 01:00:37.000000000 -0700 @@ -11,10 +11,6 @@ #include -#ifndef nullptr -#define nullptr NULL -#endif - //! \brief Returns the grayscale brightness (between 0 and 1) of a color float brightness(QColor color); --- oscar/updateparser.cpp.orig 2019-04-24 12:18:33.000000000 -0700 +++ oscar/updateparser.cpp 2020-02-14 01:00:47.000000000 -0700 @@ -11,11 +11,6 @@ #include "updateparser.h" -#ifndef nullptr -#define nullptr NULL -#endif - - Update::Update() { size = 0;