diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-09-11 20:10:43 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-09-11 20:10:43 +0200 |
| commit | 2713347f0e0ec3014501c35cd53900732fd27176 (patch) | |
| tree | 23d1c8f675ea7582fe3609039f86195764b8bd97 /hal/HalSensor.h | |
| parent | 1bf4a513c8e7fd85642827ce0938b7e1441e5e03 (diff) | |
| parent | d086e918b45bbc7a841b46c3d444b2e9d7d7e4c3 (diff) | |
| download | UXP-2713347f0e0ec3014501c35cd53900732fd27176.tar UXP-2713347f0e0ec3014501c35cd53900732fd27176.tar.gz UXP-2713347f0e0ec3014501c35cd53900732fd27176.tar.lz UXP-2713347f0e0ec3014501c35cd53900732fd27176.tar.xz UXP-2713347f0e0ec3014501c35cd53900732fd27176.zip | |
Merge branch 'ported-upstream'
Diffstat (limited to 'hal/HalSensor.h')
| -rw-r--r-- | hal/HalSensor.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hal/HalSensor.h b/hal/HalSensor.h index 551c4271d..5175629c9 100644 --- a/hal/HalSensor.h +++ b/hal/HalSensor.h @@ -18,7 +18,6 @@ namespace hal { * If you add or change any here, do the same in GeckoHalDefines.java. */ enum SensorType { - SENSOR_UNKNOWN = -1, SENSOR_ORIENTATION = 0, SENSOR_ACCELERATION = 1, SENSOR_PROXIMITY = 2, @@ -63,7 +62,7 @@ namespace IPC { struct ParamTraits<mozilla::hal::SensorType>: public ContiguousEnumSerializer< mozilla::hal::SensorType, - mozilla::hal::SENSOR_UNKNOWN, + mozilla::hal::SENSOR_ORIENTATION, mozilla::hal::NUM_SENSOR_TYPE> { }; |