1 # HG changeset patch

     2 # User Wolfgang Rosenauer <wr@rosenauer.org>

     3 # Parent e94edfdb1f5bd5c29dc54cfb83768f9c84f3f4de

     4 Bug 736854 - PHal.ipdl includes NSPR incorrectly - breaking system NSPR usage

     5 

     6 diff --git a/hal/sandbox/PHal.ipdl b/hal/sandbox/PHal.ipdl

     7 --- a/hal/sandbox/PHal.ipdl

     8 +++ b/hal/sandbox/PHal.ipdl

     9 @@ -34,17 +34,17 @@

    10   * and other provisions required by the GPL or the LGPL. If you do not delete

    11   * the provisions above, a recipient may use your version of this file under

    12   * the terms of any one of the MPL, the GPL or the LGPL.

    13   *

    14   * ***** END LICENSE BLOCK ***** */

    15  

    16  include protocol PContent;

    17  include protocol PBrowser;

    18 -include "nspr/prtime.h";

    19 +include "prtime.h";

    20  include "mozilla/HalSensor.h";

    21  include "mozilla/HalTypes.h";

    22  

    23  using PRTime;

    24  using mozilla::hal::FlashMode;

    25  using mozilla::hal::LightType;

    26  using mozilla::hal::LightMode;

    27  using mozilla::hal::SensorType;