summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.pre-2-04
-rw-r--r--ChangeLog.pre-2-104
-rw-r--r--ChangeLog.pre-2-24
-rw-r--r--ChangeLog.pre-2-44
-rw-r--r--ChangeLog.pre-2-64
-rw-r--r--ChangeLog.pre-2-84
-rw-r--r--gdk/gdkpixmap.c4
-rw-r--r--gdk/gdkprivate.h4
-rw-r--r--gdk/x11/gdkpixmap-x11.c4
-rw-r--r--glib/garray.c2
-rw-r--r--glib/gerror.c1
-rw-r--r--gtk/gtkentry.h20
13 files changed, 46 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 88d0448f21..86fb275e82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jan 1 19:43:45 PST 1998 Manish Singh <yosh@gimp.org>
+
+ * Miscellaneous portability fixes.
+
Mon Dec 29 22:05:45 1997 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gdk/gdkgc.c (gdk_gc_copy): New function, used to copy the values
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 88d0448f21..86fb275e82 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Thu Jan 1 19:43:45 PST 1998 Manish Singh <yosh@gimp.org>
+
+ * Miscellaneous portability fixes.
+
Mon Dec 29 22:05:45 1997 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gdk/gdkgc.c (gdk_gc_copy): New function, used to copy the values
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 88d0448f21..86fb275e82 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Thu Jan 1 19:43:45 PST 1998 Manish Singh <yosh@gimp.org>
+
+ * Miscellaneous portability fixes.
+
Mon Dec 29 22:05:45 1997 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gdk/gdkgc.c (gdk_gc_copy): New function, used to copy the values
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 88d0448f21..86fb275e82 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Thu Jan 1 19:43:45 PST 1998 Manish Singh <yosh@gimp.org>
+
+ * Miscellaneous portability fixes.
+
Mon Dec 29 22:05:45 1997 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gdk/gdkgc.c (gdk_gc_copy): New function, used to copy the values
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 88d0448f21..86fb275e82 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Thu Jan 1 19:43:45 PST 1998 Manish Singh <yosh@gimp.org>
+
+ * Miscellaneous portability fixes.
+
Mon Dec 29 22:05:45 1997 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gdk/gdkgc.c (gdk_gc_copy): New function, used to copy the values
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 88d0448f21..86fb275e82 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Thu Jan 1 19:43:45 PST 1998 Manish Singh <yosh@gimp.org>
+
+ * Miscellaneous portability fixes.
+
Mon Dec 29 22:05:45 1997 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gdk/gdkgc.c (gdk_gc_copy): New function, used to copy the values
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 88d0448f21..86fb275e82 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Thu Jan 1 19:43:45 PST 1998 Manish Singh <yosh@gimp.org>
+
+ * Miscellaneous portability fixes.
+
Mon Dec 29 22:05:45 1997 Miguel de Icaza <miguel@nuclecu.unam.mx>
* gdk/gdkgc.c (gdk_gc_copy): New function, used to copy the values
diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c
index cf95dfc86e..e0f4d580b2 100644
--- a/gdk/gdkpixmap.c
+++ b/gdk/gdkpixmap.c
@@ -218,10 +218,10 @@ gdk_pixmap_seek_char (FILE *infile,
gint
gdk_pixmap_read_string (FILE *infile,
gchar **buffer,
- int *buffer_size)
+ guint *buffer_size)
{
gchar c;
- gint cnt = 0;
+ guint cnt = 0;
if ((*buffer) == NULL)
{
diff --git a/gdk/gdkprivate.h b/gdk/gdkprivate.h
index f4e1fa5476..03b02f81c7 100644
--- a/gdk/gdkprivate.h
+++ b/gdk/gdkprivate.h
@@ -60,8 +60,8 @@ struct _GdkWindowPrivate
guint8 resize_count;
guint8 ref_count;
guint8 window_type;
- guint8 destroyed : 2;
- guint8 dnd_drag_enabled : 1,
+ guint destroyed : 2;
+ guint dnd_drag_enabled : 1,
dnd_drag_datashow : 1,
dnd_drag_destructive_op : 1,
dnd_drag_accepted : 1,
diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c
index cf95dfc86e..e0f4d580b2 100644
--- a/gdk/x11/gdkpixmap-x11.c
+++ b/gdk/x11/gdkpixmap-x11.c
@@ -218,10 +218,10 @@ gdk_pixmap_seek_char (FILE *infile,
gint
gdk_pixmap_read_string (FILE *infile,
gchar **buffer,
- int *buffer_size)
+ guint *buffer_size)
{
gchar c;
- gint cnt = 0;
+ guint cnt = 0;
if ((*buffer) == NULL)
{
diff --git a/glib/garray.c b/glib/garray.c
index b379225653..017e1e3b3a 100644
--- a/glib/garray.c
+++ b/glib/garray.c
@@ -42,7 +42,7 @@ static GMemChunk *array_mem_chunk = NULL;
GArray*
-g_array_new (zero_terminated)
+g_array_new (gint zero_terminated)
{
GRealArray *array;
diff --git a/glib/gerror.c b/glib/gerror.c
index 96e1013e94..1f992d9e20 100644
--- a/glib/gerror.c
+++ b/glib/gerror.c
@@ -18,6 +18,7 @@
#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
+#include <stdlib.h>
#include <sys/time.h>
#include <sys/times.h>
#include <sys/types.h>
diff --git a/gtk/gtkentry.h b/gtk/gtkentry.h
index 924edf6595..c4395fba35 100644
--- a/gtk/gtkentry.h
+++ b/gtk/gtkentry.h
@@ -43,16 +43,16 @@ struct _GtkEntry
GdkWindow *text_area;
gchar *text;
- guint16 text_size;
- guint16 text_length;
- gint16 current_pos;
- gint16 selection_start_pos;
- gint16 selection_end_pos;
- gint16 scroll_offset;
- gboolean have_selection : 1;
- gboolean visible : 1;
- guint32 timer;
- GdkIC ic;
+ guint16 text_size;
+ guint16 text_length;
+ gint16 current_pos;
+ gint16 selection_start_pos;
+ gint16 selection_end_pos;
+ gint16 scroll_offset;
+ guint have_selection : 1;
+ guint visible : 1;
+ guint32 timer;
+ GdkIC ic;
gchar *clipboard_text;
};