Sun Workshop 6 build, ORBit 0.5.8

[Ryan Lovett <ryan ocf berkeley edu>]

On Solaris 7 with WorkShop 6U1, I was getting a couple of build errors with
ORBit 0.5.8:

# E1
"../../../ORBit-0.5.8/src/IIOP/giop-msg-buffer.c", line 894: cannot do pointer arithmetic on operand of unknown size
"../../../ORBit-0.5.8/src/IIOP/giop-msg-buffer.c", line 922: cannot recover from previous errors
cc: acomp failed for ../../../ORBit-0.5.8/src/IIOP/giop-msg-buffer.c
gmake: *** [giop-msg-buffer.lo] Error 1


# E2
"../../../ORBit-0.5.8/src/orb/orb.c", line 1033: non-constant initializer: op "U&"
"../../../ORBit-0.5.8/src/orb/orb.c", line 1066: cannot recover from previous errors
cc: acomp failed for ../../../ORBit-0.5.8/src/orb/orb.c
gmake: *** [orb.lo] Error 1


The attached patch quieted these first two errors and a couple of other small
things.

Ryan

diff -urN /src/cache/gnome/ORBit-0.5.8/src/IIOP/giop-msg-buffer.c ORBit-0.5.8/src/IIOP/giop-msg-buffer.c
--- /src/cache/gnome/ORBit-0.5.8/src/IIOP/giop-msg-buffer.c	Sun May 13 00:05:52 2001
+++ ORBit-0.5.8/src/IIOP/giop-msg-buffer.c	Wed May 23 15:33:01 2001
@@ -891,7 +891,7 @@
 	retval->message_body = g_malloc(message_size+sizeof(GIOPMessageHeader)+4);
 	/* XXX1 This is a lame hack to work with the fact that
 	   alignment is relative to the MessageHeader, not the RequestHeader */
-	retval->cur = retval->message_body + 12;
+	retval->cur = GINT_TO_POINTER((GPOINTER_TO_INT(retval->message_body) + 12));
 	retval->state = GIOP_MSG_READING_BODY;
 	retval->left_to_read = message_size;
 	break;
diff -urN /src/cache/gnome/ORBit-0.5.8/src/orb/orb.c ORBit-0.5.8/src/orb/orb.c
--- /src/cache/gnome/ORBit-0.5.8/src/orb/orb.c	Sun May 13 00:10:02 2001
+++ ORBit-0.5.8/src/orb/orb.c	Wed May 23 13:38:33 2001
@@ -1030,8 +1030,12 @@
 	else if(!strcmp(identifier, "RootPOA")) {
 		if(CORBA_Object_is_nil(orb->root_poa, ev)) {
 			CORBA_Policy policybuf[1];
-			CORBA_PolicyList policies  = {1,1,policybuf,CORBA_FALSE};
 			PortableServer_POAManager poa_mgr;
+			CORBA_PolicyList policies;
+			policies._maximum = 1;
+			policies._length = 1;
+			policies._buffer = policybuf;
+			policies._release = CORBA_FALSE;
 			/* The only non-default policy used by the RootPOA is IMPLICIT ACTIVATION */ 
 			policies._buffer[0]= (CORBA_Policy)
 				PortableServer_POA_create_implicit_activation_policy(NULL,
diff -urN /src/cache/gnome/ORBit-0.5.8/test/everything/client.c ORBit-0.5.8/test/everything/client.c
--- /src/cache/gnome/ORBit-0.5.8/test/everything/client.c	Wed Apr  4 06:57:17 2001
+++ ORBit-0.5.8/test/everything/client.c	Wed May 23 14:54:50 2001
@@ -29,8 +29,8 @@
   g_assert(test_CONST_LONG==0x12345678);
   g_assert(test_CONST_LONGLONG==0x12345678);
   g_assert(strcmp(test_CONST_STRING,"ConstString")==0);
-  // I can never get constant floats to compare properly. 
-  //g_assert(test_CONST_FLOAT==1234.56);
+  /* I can never get constant floats to compare properly. */
+  /* g_assert(test_CONST_FLOAT==1234.56); */
   g_assert(test_CONST_DOUBLE==1234.5678);
   g_assert(test_FAVORITE_COLOUR==test_red);
 
diff -urN /src/cache/gnome/ORBit-0.5.8/test/everything/server.c ORBit-0.5.8/test/everything/server.c
--- /src/cache/gnome/ORBit-0.5.8/test/everything/server.c	Mon Jan 15 14:22:44 2001
+++ ORBit-0.5.8/test/everything/server.c	Wed May 23 15:00:11 2001
@@ -22,7 +22,7 @@
 #include <stdio.h>
 
 
-// Singleton accessor for the test factory
+/* Singleton accessor for the test factory */
 test_TestFactory getFactoryInstance(CORBA_Environment *ev);
 
 
diff -urN /src/cache/gnome/ORBit-0.5.8/test/test-dynany.c ORBit-0.5.8/test/test-dynany.c
--- /src/cache/gnome/ORBit-0.5.8/test/test-dynany.c	Thu Jan 11 10:38:03 2001
+++ ORBit-0.5.8/test/test-dynany.c	Wed May 23 15:11:36 2001
@@ -4,7 +4,7 @@
 
 #include <orb/orbit.h>
 
-#define CHECK_OK(ev)           (g_assert ((ev)->_major == CORBA_NO_EXCEPTION))
+#define CHECK_OK(ev)           g_assert ((ev)->_major == CORBA_NO_EXCEPTION)
 #define CHECK_TYPE_MISMATCH(ev) \
 	do { \
 		g_assert ((ev)->_major == CORBA_USER_EXCEPTION && \