[Cogl] [PATCH 3/3] use c99 types if applicable and s/gboolean/CoglBool/

[Robert Bragg]

From: Robert Bragg <robert at linux.intel.com>

TODO: squash back into owen's patch
---
 cogl/cogl-onscreen.c          |    2 +-
 cogl/cogl-onscreen.h          |    2 +-
 cogl/cogl-output-private.h    |    2 +-
 cogl/cogl-swap-info-private.h |    2 +-
 cogl/cogl-swap-info.c         |    8 ++++----
 cogl/winsys/cogl-winsys-glx.c |   12 ++++++------
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cogl/cogl-onscreen.c b/cogl/cogl-onscreen.c
index 3d17c8b..6df0583 100644
--- a/cogl/cogl-onscreen.c
+++ b/cogl/cogl-onscreen.c
@@ -481,7 +481,7 @@ cogl_onscreen_get_frame_counter (CoglOnscreen *onscreen)
 
 void
 cogl_onscreen_begin_frame (CoglOnscreen *onscreen,
-                           gint64        frame_time)
+                           int64_t frame_time)
 {
   onscreen->frame_counter++;
   onscreen->current_swap_info = (onscreen->current_swap_info + 1) % COGL_ONSCREEN_MAX_SWAP_INFOS;
diff --git a/cogl/cogl-onscreen.h b/cogl/cogl-onscreen.h
index de3f9f8..a82895b 100644
--- a/cogl/cogl-onscreen.h
+++ b/cogl/cogl-onscreen.h
@@ -560,7 +560,7 @@ cogl_onscreen_get_frame_counter (CoglOnscreen *onscreen);
  */
 void
 cogl_onscreen_begin_frame (CoglOnscreen *onscreen,
-                           gint64 frame_time);
+                           int64_t frame_time);
 
 /**
  * cogl_onscreen_get_frame_history_start:
diff --git a/cogl/cogl-output-private.h b/cogl/cogl-output-private.h
index 05803de..a4910e9 100644
--- a/cogl/cogl-output-private.h
+++ b/cogl/cogl-output-private.h
@@ -44,7 +44,7 @@ struct _CoglOutput
 };
 
 CoglOutput *_cogl_output_new (const char *name);
-gboolean _cogl_output_values_equal (CoglOutput *output,
+CoglBool _cogl_output_values_equal (CoglOutput *output,
                                     CoglOutput *other);
 
 #endif /* __COGL_OUTPUT_PRIVATE_H */
diff --git a/cogl/cogl-swap-info-private.h b/cogl/cogl-swap-info-private.h
index 8241beb..2697d53 100644
--- a/cogl/cogl-swap-info-private.h
+++ b/cogl/cogl-swap-info-private.h
@@ -36,7 +36,7 @@ struct _CoglSwapInfo
   int64_t presentation_time;
   int64_t refresh_interval;
 
-  guint complete : 1;
+  unsigned int complete : 1;
 };
 
 CoglSwapInfo *_cogl_swap_info_new (void);
diff --git a/cogl/cogl-swap-info.c b/cogl/cogl-swap-info.c
index 1ee4302..b2dda13 100644
--- a/cogl/cogl-swap-info.c
+++ b/cogl/cogl-swap-info.c
@@ -53,25 +53,25 @@ cogl_swap_info_get_complete (CoglSwapInfo *info)
   return info->complete;
 }
 
-gint64
+int64_t
 cogl_swap_info_get_frame_counter (CoglSwapInfo *info)
 {
   return info->frame_counter;
 }
 
-gint64
+int64_t
 cogl_swap_info_get_frame_time (CoglSwapInfo *info)
 {
   return info->frame_time;
 }
 
-gint64
+int64_t
 cogl_swap_info_get_presentation_time (CoglSwapInfo *info)
 {
   return info->presentation_time;
 }
 
-gint64
+int64_t
 cogl_swap_info_get_refresh_interval (CoglSwapInfo *info)
 {
   return info->refresh_interval;
diff --git a/cogl/winsys/cogl-winsys-glx.c b/cogl/winsys/cogl-winsys-glx.c
index 875239d..5d1bda5 100644
--- a/cogl/winsys/cogl-winsys-glx.c
+++ b/cogl/winsys/cogl-winsys-glx.c
@@ -179,8 +179,8 @@ ensure_ust_type (CoglRenderer *renderer,
   int64_t msc;
   int64_t sbc;
   struct timeval tv;
-  gint64 current_system_time;
-  gint64 current_monotonic_time;
+  int64_t current_system_time;
+  int64_t current_monotonic_time;
 
   if (glx_renderer->ust_type != COGL_GLX_UST_IS_UNKNOWN)
     return;
@@ -221,7 +221,7 @@ ensure_ust_type (CoglRenderer *renderer,
   return;
 }
 
-static gint64
+static int64_t
 ust_to_monotonic_time (CoglRenderer *renderer,
                        GLXDrawable   drawable,
                        int64_t       ust)
@@ -239,8 +239,8 @@ ust_to_monotonic_time (CoglRenderer *renderer,
     case COGL_GLX_UST_IS_GETTIMEOFDAY:
       {
         struct timeval tv;
-        gint64 current_system_time;
-        gint64 current_monotonic_time;
+        int64_t current_system_time;
+        int64_t current_monotonic_time;
 
         gettimeofday(&tv, NULL);
         current_system_time = (tv.tv_sec * G_GINT64_CONSTANT (1000000)) + tv.tv_usec;
@@ -254,7 +254,7 @@ ust_to_monotonic_time (CoglRenderer *renderer,
       {
         if (glx_renderer->pf_glXGetSyncValues)
           {
-            gint64 current_monotonic_time;
+            int64_t current_monotonic_time;
             int64_t ust;
             int64_t msc;
             int64_t sbc;
-- 
1.7.7.6