shithub: openh264

Download patch

ref: 4df6f9420f3f7b98c74b396643915c50bb91cd6a
parent: 3cf2be25909ec63417d0e860c74e7c07160cc45a
author: Martin Storsjö <martin@martin.st>
date: Fri Jan 16 08:51:43 EST 2015

Check for an already defined nullptr macro

In addition to the existing compiler version/feature checks, also
check if there is such a macro.

This avoids warnings when building with Xcode 6.0.

--- a/module/gmp-openh264.cpp
+++ b/module/gmp-openh264.cpp
@@ -62,7 +62,10 @@
 #endif
 
 // This is for supporting older versions which do not have support for nullptr.
-#if defined(__clang__)
+#if defined(nullptr)
+# define GMP_HAVE_NULLPTR
+
+#elif defined(__clang__)
 # ifndef __has_extension
 # define __has_extension __has_feature
 # endif