Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 12 insertions, 12 deletions

diff --git a/epan/dissectors/packet-ppi-geolocation-common.c b/epan/dissectors/packet-ppi-geolocation-common.c
index 2c6e1007..d77c1285 100644
--- a/epan/dissectors/packet-ppi-geolocation-common.c
+++ b/epan/dissectors/packet-ppi-geolocation-common.c
@@ -16,11 +16,11 @@
 
 /*
  * input: a unsigned 32-bit (native endian) value between 0 and 3600000000 (inclusive)
- * output: a signed floating point value betwen -180.0000000 and + 180.0000000, inclusive)
+ * output: a signed floating point value between -180.0000000 and + 180.0000000, inclusive)
  */
-gdouble ppi_fixed3_7_to_gdouble(guint32 in) {
-    gint32 remapped_in = in - (180 * 10000000);
-    gdouble ret = (gdouble) ((gdouble) remapped_in / 10000000);
+double ppi_fixed3_7_to_double(uint32_t in) {
+    int32_t remapped_in = in - (180 * 10000000);
+    double ret = (double) ((double) remapped_in / 10000000);
     return ret;
 }
 /*
@@ -28,8 +28,8 @@ gdouble ppi_fixed3_7_to_gdouble(guint32 in) {
  * output: a positive floating point value between 000.0000000 and 999.9999999
  */
 
-gdouble ppi_fixed3_6_to_gdouble(guint32 in) {
-    gdouble ret = (gdouble) in  / 1000000.0;
+double ppi_fixed3_6_to_double(uint32_t in) {
+    double ret = (double) in  / 1000000.0;
     return ret;
 
 }
@@ -37,15 +37,15 @@ gdouble ppi_fixed3_6_to_gdouble(guint32 in) {
  * input: a native 32 bit unsigned value between 0 and 3600000000
  * output: a signed floating point value between -180000.0000 and +180000.0000
  */
-gdouble ppi_fixed6_4_to_gdouble(guint32 in) {
-    gint32 remapped_in = in - (180000 * 10000);
-    gdouble ret = (gdouble) ((gdouble) remapped_in / 10000);
+double ppi_fixed6_4_to_double(uint32_t in) {
+    int32_t remapped_in = in - (180000 * 10000);
+    double ret = (double) ((double) remapped_in / 10000);
     return ret;
 }
 
-gdouble ppi_ns_counter_to_gdouble(guint32 in) {
-    gdouble ret;
-    ret = (gdouble) in / 1000000000;
+double ppi_ns_counter_to_double(uint32_t in) {
+    double ret;
+    ret = (double) in / 1000000000;
     return ret;
 }