forked from pool/MozillaFirefox
28 lines
900 B
Diff
28 lines
900 B
Diff
|
# HG changeset patch
|
||
|
|
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
||
|
|
# 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;
|