--- ./libefs/src/wrapper.c Fri Dec 14 14:10:05 2001 +++ ../bonobo-1.0.20/./libefs/src/wrapper.c Sun Jun 16 00:00:34 2002 @@ -402,8 +402,8 @@ if (s->err == Z_STREAM_END) { /* Check CRC */ s->crc = crc32(s->crc, start, (uInt) - ((gpointer)s->stream.next_out - - start)); + ((char*)s->stream.next_out - + (char*)start)); start = s->stream.next_out; if (gzstream_get_long(file) != s->crc) @@ -412,7 +412,7 @@ if (s->err != Z_OK || s->eof) break; } s->crc = crc32(s->crc, start, (uInt) - ((gpointer)s->stream.next_out - start)); + ((char*)s->stream.next_out - (char*)start)); *bytes_read = count - s->stream.avail_out; --- ./libefs/src/ib1_file.c Wed Aug 15 01:45:40 2001 +++ ../bonobo-1.0.20/./libefs/src/ib1_file.c Sun Jun 16 00:01:45 2002 @@ -539,7 +539,7 @@ mb = MIN ((IB1_IDATA_LEN-efs_file->pos), count); memcpy (buf, &node->data[efs_file->pos], mb); *bytes_read = mb; - buf += mb; + buf = (char*)buf + mb; efs_file->pos += mb; } @@ -554,7 +554,7 @@ memcpy (buf, ce1->data + ind, mb); *bytes_read += mb; - buf += mb; + buf = (char*)buf + mb; efs_file->pos += mb; } @@ -590,7 +590,7 @@ mb = MIN ((IB1_IDATA_LEN-efs_file->pos), count); memcpy (&node->data[efs_file->pos], buf, mb); bytes_written = mb; - buf += mb; + buf = (char*)buf + mb; efs_file->pos += mb; ib1_cache_touch (ce, TRUE); } @@ -606,7 +606,7 @@ memcpy (ce1->data+ind, buf, mb); bytes_written += mb; - buf += mb; + buf = (char*)buf + mb; efs_file->pos += mb; } --- ./samples/bonobo-class/Makefile.am Sat Feb 2 18:10:55 2002 +++ ../bonobo-1.0.20/./samples/bonobo-class/Makefile.am Sun Jun 16 00:58:59 2002 @@ -11,16 +11,16 @@ echo.h bonobo_echo_LDADD = \ + libEcho.a \ $(top_builddir)/bonobo/libbonobo.la \ $(top_builddir)/bonobo/libbonobox.la \ $(BONOBOX_TEST_LIBS) \ - libEcho.a \ $(INTLLIBS) echo_client_LDADD = \ + libEcho.a \ $(top_builddir)/bonobo/libbonobo.la \ $(BONOBOX_TEST_LIBS) \ - libEcho.a \ $(INTLLIBS) ECHO_CORBA_GENERATED = \ --- ./samples/bonobo-class/Makefile.in Thu Apr 11 11:18:29 2002 +++ ../bonobo-1.0.20/./samples/bonobo-class/Makefile.in Sun Jun 16 00:59:48 2002 @@ -174,10 +174,10 @@ bonobo_echo_SOURCES = main.c echo.c echo.h -bonobo_echo_LDADD = $(top_builddir)/bonobo/libbonobo.la $(top_builddir)/bonobo/libbonobox.la $(BONOBOX_TEST_LIBS) libEcho.a $(INTLLIBS) +bonobo_echo_LDADD = libEcho.a $(top_builddir)/bonobo/libbonobo.la $(top_builddir)/bonobo/libbonobox.la $(BONOBOX_TEST_LIBS) $(INTLLIBS) -echo_client_LDADD = $(top_builddir)/bonobo/libbonobo.la $(BONOBOX_TEST_LIBS) libEcho.a $(INTLLIBS) +echo_client_LDADD = libEcho.a $(top_builddir)/bonobo/libbonobo.la $(BONOBOX_TEST_LIBS) $(INTLLIBS) ECHO_CORBA_GENERATED = Bonobo_Sample_Echo-common.c Bonobo_Sample_Echo-skels.c Bonobo_Sample_Echo-stubs.c Bonobo_Sample_Echo.h --- ./ltmain.sh Thu Apr 11 11:10:55 2002 +++ ../bonobo-1.0.20/./ltmain.sh Tue Jun 18 11:33:32 2002 @@ -61,7 +61,7 @@ default_mode= help="Try \`$progname --help' for more information." magic="%%%MAGIC variable%%%" -mkdir="mkdir" +mkdir="mkdir -p" mv="mv -f" rm="rm -f" --- ./bonobo/Makefile.am Sat Feb 2 18:10:34 2002 +++ ../bonobo-1.0.20/./bonobo/Makefile.am Sun Jun 16 00:06:02 2002 @@ -52,6 +52,8 @@ $(CORBA_SOURCE): $(idls) $(ORBIT_IDL) $(top_srcdir)/idl/Bonobo.idl -I$(top_srcdir)/idl $(idl_flags) +libbonobo_la_LIBADD = -no_unresolved -L. $(subst -lbonobo,,$(BONOBO_LIBS)) + libbonobo_la_LDFLAGS = \ -version-info $(BONOBO_CURRENT):$(BONOBO_REVISION):$(BONOBO_AGE) \ $(PROF_LDFLAGS) @@ -182,6 +184,10 @@ bonobo-ui-xml.h \ bonobo-running-context.h +libbonobox_la_DEPENDENCIES = libbonobo.la + +libbonobox_la_LIBADD = -no_unresolved -L. $(subst -lbonobox,,$(BONOBOX_LIBS)) $(INTLLIBS) + libbonobox_la_LDFLAGS = \ -version-info $(BONOBO_CURRENT):$(BONOBO_REVISION):$(BONOBO_AGE) @@ -231,6 +237,10 @@ bonobo-wrapper.c \ bonobo-zoomable.c \ bonobo-zoomable-frame.c + +libbonobo_print_la_DEPENDENCIES = libbonobo.la libbonobox.la + +libbonobo_print_la_LIBADD = -no_unresolved -L. $(subst -lbonobo-print,,$(BONOBOX_PRINT_LIBS)) libbonobo_print_la_LDFLAGS = \ -version-info $(BONOBO_CURRENT):$(BONOBO_REVISION):$(BONOBO_AGE) --- ./bonobo/Makefile.in Thu Apr 11 11:18:06 2002 +++ ../bonobo-1.0.20/./bonobo/Makefile.in Sun Jun 16 00:33:27 2002 @@ -223,7 +223,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. LIBS = @LIBS@ -libbonobo_la_LIBADD = +libbonobo_la_LIBADD = -no_unresolved -L. $(subst -lbonobo,,$(BONOBO_LIBS)) libbonobo_la_OBJECTS = Bonobo-common.lo Bonobo-stubs.lo Bonobo-skels.lo \ bonobo-activation-context.lo bonobo-arg.lo bonobo-async.lo \ bonobo-context.lo bonobo-event-source.lo bonobo-exception.lo \ @@ -238,7 +238,8 @@ bonobo-transient.lo bonobo-property.lo bonobo-property-bag.lo \ bonobo-property-bag-client.lo bonobo-property-control.lo \ bonobo-running-context.lo -libbonobox_la_LIBADD = +libbonobox_la_DEPENDENCIES = libbonobo.la +libbonobox_la_LIBADD = -no_unresolved -L. $(subst -lbonobox,,$(BONOBOX_LIBS)) $(INTLLIBS) libbonobox_la_OBJECTS = bonobo-canvas-component.lo \ bonobo-canvas-item.lo bonobo-client-site.lo bonobo-control-frame.lo \ bonobo-control.lo bonobo-desktop-window.lo bonobo-embeddable.lo \ @@ -257,7 +258,8 @@ bonobo-ui-util.lo bonobo-ui-xml.lo bonobo-view-frame.lo bonobo-view.lo \ bonobo-widget.lo bonobo-win.lo bonobo-wrapper.lo bonobo-zoomable.lo \ bonobo-zoomable-frame.lo -libbonobo_print_la_LIBADD = +libbonobo_print_la_DEPENDENCIES = libbonobo.la libbonobox.la +libbonobo_print_la_LIBADD = -no_unresolved -L. $(subst -lbonobo-print,,$(BONOBOX_PRINT_LIBS)) libbonobo_print_la_OBJECTS = bonobo-print.lo bonobo-print-client.lo COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --- ./bonobo/bonobo-object.c Wed Oct 31 18:31:40 2001 +++ ../bonobo-1.0.20/./bonobo/bonobo-object.c Sun Jun 16 00:08:29 2002 @@ -12,6 +12,19 @@ #define _GNU_SOURCE /* for dladdr */ #include +#if !defined(HAVE_DLADDR) && defined(__sgi) +#define HAVE_DLADDR +#define __USE_GNU +#include +typedef struct Dl_info Dl_info; + +int dladdr(void *address, Dl_info *dl) +{ + void *v; + v = _rld_new_interface(_RLD_DLADDR, address, dl); + return (int)v; +} +#endif #ifdef HAVE_DLADDR #include #endif --- ./bonobo/bonobo-object-io.c Sat Feb 2 18:22:31 2002 +++ ../bonobo-1.0.20/./bonobo/bonobo-object-io.c Sun Jun 16 00:10:01 2002 @@ -28,7 +28,8 @@ CORBA_Environment *ev) { char *copy; - int len, slen; + int len; + gint32 slen; g_return_if_fail (target != CORBA_OBJECT_NIL); g_return_if_fail (object_iid != NULL); @@ -36,7 +37,7 @@ slen = strlen (object_iid) + 1; len = sizeof (gint32) + slen; copy = g_malloc (len); - *((gint32 *) copy) = slen; + memcpy (copy, &slen, sizeof (gint32)); strcpy (copy + sizeof (gint32), object_iid); bonobo_stream_client_write (target, copy, len, ev); --- ./bonobo/bonobo-property-bag.c Tue Aug 7 15:23:21 2001 +++ ../bonobo-1.0.20/./bonobo/bonobo-property-bag.c Sun Jun 16 00:11:07 2002 @@ -651,11 +651,11 @@ { g_return_if_fail (pb != NULL); - return bonobo_property_bag_add_full (pb, name, idx, type, - default_value, docstring, flags, - pb->priv->get_prop, - pb->priv->set_prop, - pb->priv->user_data); + bonobo_property_bag_add_full (pb, name, idx, type, + default_value, docstring, flags, + pb->priv->get_prop, + pb->priv->set_prop, + pb->priv->user_data); } static void