use c99 types if applicable and s/gboolean/CoglBool/

TODO: squash back into owen's patch

6 files changed, 14 insertions, 14 deletions

diff --git a/cogl/cogl-onscreen.c b/cogl/cogl-onscreen.c
index 8d60722e..a7edd148 100644
--- a/cogl/cogl-onscreen.c
+++ b/cogl/cogl-onscreen.c
@@ -471,7 +471,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 b2f6a5f9..47d35c12 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 05803ded..a4910e9c 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 8241bebf..2697d534 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 1ee43028..b2dda13c 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 6b829358..a62ccde4 100644
--- a/cogl/winsys/cogl-winsys-glx.c
+++ b/cogl/winsys/cogl-winsys-glx.c
@@ -183,8 +183,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;
@@ -225,7 +225,7 @@ ensure_ust_type (CoglRenderer *renderer,
   return;
 }
 
-static gint64
+static int64_t
 ust_to_monotonic_time (CoglRenderer *renderer,
                        GLXDrawable   drawable,
                        int64_t       ust)
@@ -243,8 +243,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;
@@ -258,7 +258,7 @@ ust_to_monotonic_time (CoglRenderer *renderer,
       {
         if (glx_renderer->glXGetSyncValues)
           {
-            gint64 current_monotonic_time;
+            int64_t current_monotonic_time;
             int64_t ust;
             int64_t msc;
             int64_t sbc;