rep-gtk r366 - trunk

[chrisb svn gnome org]

Author: chrisb
Date: Fri Aug  8 21:29:12 2008
New Revision: 366
URL: http://svn.gnome.org/viewvc/rep-gtk?rev=366&view=rev

Log:
small code-cleanup - allows building with CFLAGS="-Wall -ansi -pedantic"


Modified:
   trunk/ChangeLog
   trunk/rep-gtk.c
   trunk/rep-gtk.h
   trunk/rep-types.c

Modified: trunk/rep-gtk.c
==============================================================================
--- trunk/rep-gtk.c	(original)
+++ trunk/rep-gtk.c	Fri Aug  8 21:29:12 2008
@@ -2121,8 +2121,8 @@
     struct timeout_data *next;
     int timed_out;
     int idle_counter;
-    u_long this_timeout_msecs;
-    u_long actual_timeout_msecs;
+    unsigned long this_timeout_msecs;
+    unsigned long actual_timeout_msecs;
     int gtk_tag;
 };
 
@@ -2213,7 +2213,7 @@
 {
     if (context != 0 && !context->timed_out && !context->gtk_tag)
     {
-	u_long max_sleep = rep_max_sleep_for ();
+	unsigned long max_sleep = rep_max_sleep_for ();
 	context->this_timeout_msecs = rep_input_timeout_secs * 1000;
 	context->actual_timeout_msecs = MIN (context->this_timeout_msecs,
 					     max_sleep);
@@ -2253,7 +2253,7 @@
 
     while (1)
     {
-	u_long max_sleep = rep_max_sleep_for ();
+	unsigned long max_sleep = rep_max_sleep_for ();
 
 	if (rep_redisplay_fun != 0)
 	    (*rep_redisplay_fun)();

Modified: trunk/rep-gtk.h
==============================================================================
--- trunk/rep-gtk.h	(original)
+++ trunk/rep-gtk.h	Fri Aug  8 21:29:12 2008
@@ -83,10 +83,10 @@
 int sgtk_valid_long (repv obj);
 int sgtk_valid_ulong (repv obj);
 int sgtk_valid_char (repv obj);
-repv sgtk_uint_to_rep (u_long x);
+repv sgtk_uint_to_rep (unsigned long x);
 repv sgtk_int_to_rep (long x);
 repv sgtk_long_to_rep (long x);
-repv sgtk_ulong_to_rep (u_long x);
+repv sgtk_ulong_to_rep (unsigned long x);
 guint sgtk_rep_to_uint (repv obj);
 gint sgtk_rep_to_int (repv obj);
 gulong sgtk_rep_to_ulong (repv obj);

Modified: trunk/rep-types.c
==============================================================================
--- trunk/rep-types.c	(original)
+++ trunk/rep-types.c	Fri Aug  8 21:29:12 2008
@@ -66,7 +66,7 @@
 }
 
 repv
-sgtk_uint_to_rep (u_long x)
+sgtk_uint_to_rep (unsigned long x)
 {
     return rep_make_long_uint (x);
 }
@@ -84,7 +84,7 @@
 }
 
 repv
-sgtk_ulong_to_rep (u_long x)
+sgtk_ulong_to_rep (unsigned long x)
 {
     return rep_make_long_uint (x);
 }
@@ -128,7 +128,7 @@
 char *
 sgtk_rep_to_string (repv obj)
 {
-    return rep_STRINGP (obj) ? rep_STR (obj) : (u_char *)"";
+    return rep_STRINGP (obj) ? rep_STR (obj) : (unsigned char *)"";
 }
 
 repv