From: Lucas De Marchi Date: Wed, 1 May 2013 05:28:07 +0000 (-0300) Subject: thermometer: Get rid of gint X-Git-Tag: android-x86-4.4-r3~8220 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=de7e3aaa90008388ecb49b0079085911cc81414f;p=android-x86%2Fexternal-bluetooth-bluez.git thermometer: Get rid of gint Use plain int instead of gint. In glib gint is always a typedef to int, so it's safe to use it even for callbacks with glib. --- diff --git a/profiles/thermometer/thermometer.c b/profiles/thermometer/thermometer.c index 3757b2524..c2ca25113 100644 --- a/profiles/thermometer/thermometer.c +++ b/profiles/thermometer/thermometer.c @@ -190,7 +190,7 @@ static void destroy_thermometer_adapter(gpointer user_data) g_free(tadapter); } -static gint cmp_adapter(gconstpointer a, gconstpointer b) +static int cmp_adapter(gconstpointer a, gconstpointer b) { const struct thermometer_adapter *tadapter = a; const struct btd_adapter *adapter = b; @@ -201,7 +201,7 @@ static gint cmp_adapter(gconstpointer a, gconstpointer b) return -1; } -static gint cmp_device(gconstpointer a, gconstpointer b) +static int cmp_device(gconstpointer a, gconstpointer b) { const struct thermometer *t = a; const struct btd_device *dev = b; @@ -212,7 +212,7 @@ static gint cmp_device(gconstpointer a, gconstpointer b) return -1; } -static gint cmp_watcher(gconstpointer a, gconstpointer b) +static int cmp_watcher(gconstpointer a, gconstpointer b) { const struct watcher *watcher = a; const struct watcher *match = b;