diff -crN ./ORBit2/ORBit-2.0.pc.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./ORBit2/ORBit-2.0.pc.in *** ./ORBit2/ORBit-2.0.pc.in Sat May 31 16:04:33 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./ORBit2/ORBit-2.0.pc.in Fri Jan 23 16:12:48 2004 *************** *** 9,13 **** Description: High-performance CORBA Object Request Broker. Version: @ORBIT_VERSION@ Requires: glib-2.0 gmodule-2.0 ! Libs: -L${libdir} -lORBit-2 @ORBIT_LIBS@ @LIBS@ -lm Cflags: -I${includedir}/orbit-2.0 -DORBIT2=1 --- 9,13 ---- Description: High-performance CORBA Object Request Broker. Version: @ORBIT_VERSION@ Requires: glib-2.0 gmodule-2.0 ! Libs: -L${libdir} -lORBit-2 @ORBIT_LIBS_PC@ @LIBS@ -lm Cflags: -I${includedir}/orbit-2.0 -DORBIT2=1 diff -crN ./ORBit2/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./ORBit2/configure.in *** ./ORBit2/configure.in Tue Sep 9 09:47:05 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./ORBit2/configure.in Tue Jan 27 15:27:27 2004 *************** *** 137,143 **** --- 137,149 ---- gobject-2.0 >= $GLIB_REQUIRED \ gthread-2.0 >= $GLIB_REQUIRED \ gmodule-2.0 >= $GLIB_REQUIRED) + + if test "x$ORBIT_LIBS_PC" = "x" ; then + ORBIT_LIBS_PC=$ORBIT_LIBS + fi + AC_SUBST(ORBIT_LIBS) + AC_SUBST(ORBIT_LIBS_PC) AC_SUBST(ORBIT_CFLAGS) PKG_CHECK_MODULES(ORBIT_IDL, \ diff -crN ./ORBit2/include/orbit/GIOP/giop-recv-buffer.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./ORBit2/include/orbit/GIOP/giop-recv-buffer.h *** ./ORBit2/include/orbit/GIOP/giop-recv-buffer.h Fri May 30 16:54:25 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./ORBit2/include/orbit/GIOP/giop-recv-buffer.h Wed Oct 22 09:36:29 2003 *************** *** 42,48 **** GIOPVersion giop_version; gulong left_to_read; ! guchar free_body : 1; }; #define giop_msg_conversion_needed(msg) giop_endian_conversion_needed(GIOP_MSG(msg)->header.flags) --- 42,48 ---- GIOPVersion giop_version; gulong left_to_read; ! gboolean free_body : 1; }; #define giop_msg_conversion_needed(msg) giop_endian_conversion_needed(GIOP_MSG(msg)->header.flags) diff -crN ./ORBit2/linc2/src/linc-debug.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./ORBit2/linc2/src/linc-debug.h *** ./ORBit2/linc2/src/linc-debug.h Mon Jul 14 15:35:38 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./ORBit2/linc2/src/linc-debug.h Wed Oct 22 09:37:06 2003 *************** *** 1,21 **** #ifndef _LINK_DEBUG_H #define _LINK_DEBUG_H /* * Enables debug on the Unix socket / connection */ #undef CONNECTION_DEBUG #ifndef CONNECTION_DEBUG static inline void d_printf (const char *format, ...) { } # define STATE_NAME(s) "" #else # include ! # define d_printf(format...) fprintf (stderr, format) # define STATE_NAME(s) (((s) == LINK_CONNECTED) ? "Connected" : \ ((s) == LINK_CONNECTING) ? "Connecting" : \ ((s) == LINK_DISCONNECTED) ? "Disconnected" : \ "Invalid state") #endif #endif /* _LINK_DEBUG_H */ --- 1,41 ---- + #ifndef _LINK_DEBUG_H #define _LINK_DEBUG_H + #include "config.h" + /* * Enables debug on the Unix socket / connection */ #undef CONNECTION_DEBUG #ifndef CONNECTION_DEBUG + static inline void d_printf (const char *format, ...) { } + # define STATE_NAME(s) "" + #else + # include ! # include ! # define STATE_NAME(s) (((s) == LINK_CONNECTED) ? "Connected" : \ ((s) == LINK_CONNECTING) ? "Connecting" : \ ((s) == LINK_DISCONNECTED) ? "Disconnected" : \ "Invalid state") + + static inline d_printf(format, ...) + { + va_list args; + + va_start(args, format); + + vfprintf (stderr, format, va_arg(args, char *);) + + va_end(args); + }; + #endif #endif /* _LINK_DEBUG_H */ diff -crN ./ORBit2/src/orb/GIOP/giop-connection.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./ORBit2/src/orb/GIOP/giop-connection.c *** ./ORBit2/src/orb/GIOP/giop-connection.c Fri Aug 8 18:13:24 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./ORBit2/src/orb/GIOP/giop-connection.c Wed Oct 22 09:37:48 2003 *************** *** 15,21 **** static void giop_connection_real_state_changed (LinkConnection *cnx, ! LinkConnectionStatus status) { GIOPConnection *gcnx = GIOP_CONNECTION (cnx); --- 15,21 ---- static void giop_connection_real_state_changed (LinkConnection *cnx, ! LinkConnectionStatus status) { GIOPConnection *gcnx = GIOP_CONNECTION (cnx); diff -crN ./ORBit2/test/poa/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./ORBit2/test/poa/Makefile.am *** ./ORBit2/test/poa/Makefile.am Tue Jun 24 12:43:49 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./ORBit2/test/poa/Makefile.am Wed Oct 15 08:22:33 2003 *************** *** 15,21 **** poatest-basic10.c \ poatest-basic11.c ! # poatest-basic05.c TESTS = test-poa \ poatest-basic01 \ --- 15,21 ---- poatest-basic10.c \ poatest-basic11.c ! # poatest-basic05.c TESTS = test-poa \ poatest-basic01 \ *************** *** 28,37 **** poatest-basic09 \ poatest-basic10 ! # these don't work - it seems ! noinst_PROGRAMS= \ ! poatest-basic11 \ ! poatest-basic05 check_PROGRAMS = $(TESTS) --- 28,34 ---- poatest-basic09 \ poatest-basic10 ! # poatest-basic05 check_PROGRAMS = $(TESTS) diff -crN ./ORBit2/test/test-mem.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./ORBit2/test/test-mem.c *** ./ORBit2/test/test-mem.c Tue Sep 9 09:46:38 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./ORBit2/test/test-mem.c Wed Oct 22 09:39:01 2003 *************** *** 173,178 **** --- 173,179 ---- g_warning ("parse error, executing \"%s\" failed", cmd); break; default: + break; } pclose (handle); return ret;