mozilla-system-nspr.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Sat, 31 Mar 2012 22:19:28 +0200
changeset 419 f6b055dd94bc
permissions -rw-r--r--
commit Aurora 13 state
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
419
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
# User Wolfgang Rosenauer <wr@rosenauer.org>
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
# Parent e94edfdb1f5bd5c29dc54cfb83768f9c84f3f4de
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
Bug 736854 - PHal.ipdl includes NSPR incorrectly - breaking system NSPR usage
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
diff --git a/hal/sandbox/PHal.ipdl b/hal/sandbox/PHal.ipdl
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
--- a/hal/sandbox/PHal.ipdl
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
+++ b/hal/sandbox/PHal.ipdl
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
@@ -34,17 +34,17 @@
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
  * and other provisions required by the GPL or the LGPL. If you do not delete
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
  * the provisions above, a recipient may use your version of this file under
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
  * the terms of any one of the MPL, the GPL or the LGPL.
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
  *
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
  * ***** END LICENSE BLOCK ***** */
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
 
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
 include protocol PContent;
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
 include protocol PBrowser;
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
-include "nspr/prtime.h";
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
+include "prtime.h";
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
 include "mozilla/HalSensor.h";
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
 include "mozilla/HalTypes.h";
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
 
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
 using PRTime;
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    24
 using mozilla::hal::FlashMode;
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
 using mozilla::hal::LightType;
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
 using mozilla::hal::LightMode;
f6b055dd94bc commit Aurora 13 state
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    27
 using mozilla::hal::SensorType;