gfx/angle/angle-nspr-misc.patch
author Bas Schouten <bas.schouten@live.nl>
Tue, 08 Feb 2011 18:44:14 -0600
changeset 62211 fa1a4b6abff0d357235b6e293dcba6aa1e592262
parent 61599 af518fbee5648062828ba6bc074d7812820738fd
child 70098 478015023b8aad08073980ee1a8a6bd118d60601
permissions -rw-r--r--
Bug 612103 - Followup: Only report a failure when the call actually fails. r=jrmuizel a=blocking-final

# HG changeset patch
# Parent 3f4e2a35c49bb865018798a76b62c169d8e3537b
diff --git a/gfx/angle/src/compiler/osinclude.h b/gfx/angle/src/compiler/osinclude.h
--- a/gfx/angle/src/compiler/osinclude.h
+++ b/gfx/angle/src/compiler/osinclude.h
@@ -7,17 +7,19 @@
 #ifndef __OSINCLUDE_H
 #define __OSINCLUDE_H
 
 //
 // This file contains contains os-specific datatypes and
 // declares any os-specific functions.
 //
 
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(ANGLE_USE_NSPR)
+/* no need to define anything when using NSPR */
+#elif defined(_WIN32) || defined(_WIN64)
 #define ANGLE_OS_WIN
 #elif defined(__APPLE__) || defined(__linux__) || \
       defined(__FreeBSD__) || defined(__OpenBSD__) || \
       defined(__sun)
 #define ANGLE_OS_POSIX
 #else
 #error Unsupported platform.
 #endif