[filesystem.c] Add a cast to aviod a warning with VisualStudio 2017.

[metze/wireshark/wip.git] / wsutil / type_util.c

diff --git a/wsutil/type_util.c b/wsutil/type_util.c
index 87a401f8356aad0fe2988d830e83282c72c9e6df..8256dd7e635067c604107f75cccb4cf28f2f148a 100644 (file)
--- a/wsutil/type_util.c
+++ b/wsutil/type_util.c
@@ -1,8 +1,6 @@
 /* type_util.c
  * Types utility routines
  *
- * $Id$
- *
  * Wireshark - Network traffic analyzer
  * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
@@ -22,11 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
-#include <glib.h>
 #include "type_util.h"
 
 /*
@@ -40,7 +35,7 @@
  * gstutils.h: Header for various utility functions
  *
  * GNU GPL v2
- * 
+ *
  */
 
 /* work around error C2520: conversion from unsigned __int64 to double
@@ -53,7 +48,7 @@
 gdouble
 type_util_guint64_to_gdouble(guint64 value)
 {
-  if (value & G_GINT64_CONSTANT (0x8000000000000000))
+  if (value & G_GUINT64_CONSTANT (0x8000000000000000))
     return (gdouble) ((gint64) value) + (gdouble) 18446744073709551616.;
   else
     return (gdouble) ((gint64) value);
@@ -68,3 +63,16 @@ type_util_gdouble_to_guint64(gdouble value)
   value -= (gdouble) 18446744073709551616.;
   return ((guint64) ((gint64) value));
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local Variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
+ */