File nss-3.31-nullptr.diff of Package mozilla-nss

Overview Repositories Revisions Requests Users Attributes Meta

File nss-3.31-nullptr.diff of Package mozilla-nss

diff -rNU 10 ../../nss-3.31-o/nss/gtests/google_test/gtest/include/gtest/gtest.h ./gtests/google_test/gtest/include/gtest/gtest.h
--- ../../nss-3.31-o/nss/gtests/google_test/gtest/include/gtest/gtest.h	2017-06-08 12:53:01.000000000 +0200
+++ ./gtests/google_test/gtest/include/gtest/gtest.h	2017-09-06 17:27:06.000000000 +0200
@@ -58,20 +58,24 @@
 #include "gtest/internal/gtest-internal.h"
 #include "gtest/internal/gtest-string.h"
 #include "gtest/gtest-death-test.h"
 #include "gtest/gtest-message.h"
 #include "gtest/gtest-param-test.h"
 #include "gtest/gtest-printers.h"
 #include "gtest/gtest_prod.h"
 #include "gtest/gtest-test-part.h"
 #include "gtest/gtest-typed-test.h"
 
+#ifndef nullptr
+#define nullptr NULL
+#endif
+
 // Depending on the platform, different string classes are available.
 // On Linux, in addition to ::std::string, Google also makes use of
 // class ::string, which has the same interface as ::std::string, but
 // has a different implementation.
 //
 // You can define GTEST_HAS_GLOBAL_STRING to 1 to indicate that
 // ::string is available AND is a distinct type to ::std::string, or
 // define it to 0 to indicate otherwise.
 //
 // If ::std::string and ::string are the same class on your platform
diff -rNU 10 ../../nss-3.31-o/nss/manifest.mn ./manifest.mn
--- ../../nss-3.31-o/nss/manifest.mn	2017-06-08 12:53:01.000000000 +0200
+++ ./manifest.mn	2017-09-06 18:07:01.000000000 +0200
@@ -3,11 +3,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = .
 DEPTH      = .
 
 IMPORTS =	nspr20/v4.8 \
 		$(NULL)
 
 RELEASE = nss
 
-DIRS = coreconf lib cmd gtests
+DIRS = coreconf lib cmd

Places

File nss-3.31-nullptr.diff of Package mozilla-nss

Places