diff -r df9c4a6e84f8 -r 7d934b2f5014 mozilla-system-nspr.patch --- a/mozilla-system-nspr.patch Wed Apr 25 13:47:56 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -# HG changeset patch -# User Wolfgang Rosenauer -# Parent e94edfdb1f5bd5c29dc54cfb83768f9c84f3f4de -Bug 736854 - PHal.ipdl includes NSPR incorrectly - breaking system NSPR usage - -diff --git a/hal/sandbox/PHal.ipdl b/hal/sandbox/PHal.ipdl ---- a/hal/sandbox/PHal.ipdl -+++ b/hal/sandbox/PHal.ipdl -@@ -34,17 +34,17 @@ - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - - include protocol PContent; - include protocol PBrowser; --include "nspr/prtime.h"; -+include "prtime.h"; - include "mozilla/HalSensor.h"; - include "mozilla/HalTypes.h"; - - using PRTime; - using mozilla::hal::FlashMode; - using mozilla::hal::LightType; - using mozilla::hal::LightMode; - using mozilla::hal::SensorType;