[monkey-bubble: 483/753] Small changes to ensure correct operation when library is compiled on

[Sven Herzberg <herzi src gnome org>]

commit 947975a9e210638ef214e7180d84d1e223dc25a9
Author: Mark Murnane <mmurnane src gnome org>
Date:   Mon Jun 25 09:56:20 2001 +0000

    Small changes to ensure correct operation when library is compiled on
    
    
     * Small changes to ensure correct operation when library is compiled on
       64-bit platform.

 libgnomeui/ChangeLog                |   19 +++++++++++++++++++
 libgnomeui/gnome-dateedit.c         |    2 +-
 libgnomeui/gnome-icon-text.c        |    5 +++--
 libgnomeui/gnome-less.c             |    4 ++--
 libgnomeui/gnome-remote-bootstrap.c |    4 ++--
 libgnomeui/gnome-unit-spinner.c     |    1 +
 6 files changed, 28 insertions(+), 7 deletions(-)
---
diff --git a/libgnomeui/ChangeLog b/libgnomeui/ChangeLog
index b2aa4f8..38620bb 100644
--- a/libgnomeui/ChangeLog
+++ b/libgnomeui/ChangeLog
@@ -1,3 +1,22 @@
+2001-06-21  Mark Murnane  <Mark Murnane Sun com>
+
+	* Changes made during 64-bit cleaning.
+
+	* gnome-dateedit.c (day_selected): Modified type of day, month and year
+	to match signature of gtk_calendar_get_date.
+
+	* gnome-icon-text.c (gnome_icon_layout_text):  Changed w_len and sublen
+ 	to a gsize.
+
+	* gnome-less.c (gnome_less_write_fd): Changes len and bytes_written to
+	a gsize.
+
+	* gnome-remote_bootstrap.c (main): Changed setenv to putenv.  Solaris
+	does not have a setenv libc function.
+
+	* gnome-unit-spinner.c: Added include directive for string.h.  Required
+	to ensure proper forward declaration of strcmp().
+
 2001-06-21  Jens Finke  <jens gnome org>
 
 	* libgnomeui.h: Don't include gnome-animator.h.
diff --git a/libgnomeui/gnome-dateedit.c b/libgnomeui/gnome-dateedit.c
index 5662be1..6957481 100644
--- a/libgnomeui/gnome-dateedit.c
+++ b/libgnomeui/gnome-dateedit.c
@@ -116,7 +116,7 @@ static void
 day_selected (GtkCalendar *calendar, GnomeDateEdit *gde)
 {
 	char buffer [40];
-	gint year, month, day;
+	guint year, month, day;
 
 	gtk_calendar_get_date (calendar, &year, &month, &day);
 
diff --git a/libgnomeui/gnome-icon-text.c b/libgnomeui/gnome-icon-text.c
index f500741..ecf4eb9 100644
--- a/libgnomeui/gnome-icon-text.c
+++ b/libgnomeui/gnome-icon-text.c
@@ -92,7 +92,8 @@ gnome_icon_layout_text (GdkFont *font, const gchar *text, const gchar *separator
 	GdkWChar *row_end;
 	GdkWChar *s, *word_start, *word_end, *old_word_end;
 	GdkWChar *sub_text;
-	int i, w_len, w;
+	int i, w;
+	gsize w_len;
 	GdkWChar *text_wc, *text_iter, *separators_wc;
 	int text_len_wc, separators_len_wc;
 
@@ -218,7 +219,7 @@ gnome_icon_layout_text (GdkFont *font, const gchar *text, const gchar *separator
 		} else {
 			/* Create subrow and append it to the list */
 
-			int sub_len;
+			gsize sub_len;
 			sub_len = word_end - text_iter;
 
 			sub_text = g_new (GdkWChar, sub_len + 1);
diff --git a/libgnomeui/gnome-less.c b/libgnomeui/gnome-less.c
index db9d3f3..1db53a7 100644
--- a/libgnomeui/gnome-less.c
+++ b/libgnomeui/gnome-less.c
@@ -521,8 +521,8 @@ gboolean
 gnome_less_write_fd(GnomeLess * gl, int fd)
 {
 	gchar * contents;
-	gint len;
-	gint bytes_written;
+	gsize len;
+	gsize bytes_written;
 	GtkTextIter start, end;
 
 
diff --git a/libgnomeui/gnome-remote-bootstrap.c b/libgnomeui/gnome-remote-bootstrap.c
index 9979cde..144c837 100644
--- a/libgnomeui/gnome-remote-bootstrap.c
+++ b/libgnomeui/gnome-remote-bootstrap.c
@@ -61,9 +61,9 @@ int main(int argc, char **argv)
       return 1;
     }
 
-  setenv("DISPLAY", display, TRUE);
+  putenv(g_strconcat("DISPLAY", display));
   if(strcmp(languages, "C"))
-    setenv("LANG", languages, TRUE);
+    putenv(g_strconcat("LANG", languages));
 
   memset(&myprog, 0, sizeof(myprog));
   myprog.pipe_fd = -1;
diff --git a/libgnomeui/gnome-unit-spinner.c b/libgnomeui/gnome-unit-spinner.c
index 71f3bd2..4f74969 100644
--- a/libgnomeui/gnome-unit-spinner.c
+++ b/libgnomeui/gnome-unit-spinner.c
@@ -21,6 +21,7 @@
 */
 
 #include <ctype.h>
+#include <string.h>
 
 #include "gnome-unit-spinner.h"
 #include "gdk/gdkkeysyms.h"