[PATCH] Darwin-related fixes for ORBit2

[Hans Petter Jansson <hpj novell com>]

Patch is for HEAD. Comments are in ChangeLogs. Please review.

-- 
Hans Petter Jansson | <hpj novell com>
Evolution Developer | http://hp.cl.no/

? depcomp
? gtk-doc.make
? ORBit2-darwin.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/ORBit2/ChangeLog,v
retrieving revision 1.682
diff -u -p -r1.682 ChangeLog
--- ChangeLog	27 Jan 2005 15:00:23 -0000	1.682
+++ ChangeLog	28 Jan 2005 04:50:00 -0000
@@ -1,3 +1,13 @@
+2005-01-27  Hans Petter Jansson  <hpj novell com>
+
+	* configure.in: Check for res_9_init() in -lresolv. This will pull in
+	libresolv on Darwin, where the actual symbol's name is different from
+	the one used by programs.
+
+	* include/orbit/orb-core/corba-typecode.h: Declare the typecode structs
+	const, as in the corresponding .c file. Compiler was bailing out on
+	this.
+
 2005-01-27  Tor Lillqvist  <tml novell com>
 
 	* src/idl-compiler/Makefile.am
Index: configure.in
===================================================================
RCS file: /cvs/gnome/ORBit2/configure.in,v
retrieving revision 1.141
diff -u -p -r1.141 configure.in
--- configure.in	26 Jan 2005 22:33:17 -0000	1.141
+++ configure.in	28 Jan 2005 04:50:00 -0000
@@ -269,6 +269,7 @@ dnl AC_CHECK_HEADERS(linux/irda.h)
 dnl Checks for library functions.
 AC_CHECK_FUNCS(poll basename)
 AC_CHECK_FUNC(res_init,,[AC_CHECK_LIB(resolv,res_init)])
+AC_CHECK_LIB(resolv,res_9_init)
 AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])
 AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
 AC_CHECK_FUNC(getaddrinfo,,[AC_CHECK_LIB(nsl,getaddrinfo)])
Index: include/orbit/orb-core/corba-typecode.h
===================================================================
RCS file: /cvs/gnome/ORBit2/include/orbit/orb-core/corba-typecode.h,v
retrieving revision 1.18
diff -u -p -r1.18 corba-typecode.h
--- include/orbit/orb-core/corba-typecode.h	27 Jan 2005 12:24:06 -0000	1.18
+++ include/orbit/orb-core/corba-typecode.h	28 Jan 2005 04:50:01 -0000
@@ -30,7 +30,7 @@ struct CORBA_TypeCode_struct {
 	CORBA_short scale;	            /* for fixed */
 };
 
-extern ORBit_RootObject_Interface ORBit_TypeCode_epv;
+extern const ORBit_RootObject_Interface ORBit_TypeCode_epv;
 
 #define TC_null ((CORBA_TypeCode)&TC_null_struct)
 #define TC_void ((CORBA_TypeCode)&TC_void_struct)
@@ -54,27 +54,27 @@ extern ORBit_RootObject_Interface ORBit_
 #define TC_CORBA_string ((CORBA_TypeCode)&TC_CORBA_string_struct)
 #define TC_CORBA_wstring ((CORBA_TypeCode)&TC_CORBA_wstring_struct)
 
-extern struct CORBA_TypeCode_struct TC_null_struct;
-extern struct CORBA_TypeCode_struct TC_void_struct;
-extern struct CORBA_TypeCode_struct TC_CORBA_char_struct;
-extern struct CORBA_TypeCode_struct TC_CORBA_wchar_struct;
-extern struct CORBA_TypeCode_struct TC_CORBA_string_struct;
-extern struct CORBA_TypeCode_struct TC_CORBA_wstring_struct;
-extern struct CORBA_TypeCode_struct TC_CORBA_long_struct;
-extern struct CORBA_TypeCode_struct TC_CORBA_unsigned_long_struct;
-extern struct CORBA_TypeCode_struct TC_CORBA_short_struct;
-extern struct CORBA_TypeCode_struct TC_CORBA_unsigned_short_struct;
-extern struct CORBA_TypeCode_struct TC_CORBA_octet_struct;
+extern const struct CORBA_TypeCode_struct TC_null_struct;
+extern const struct CORBA_TypeCode_struct TC_void_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_char_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_wchar_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_string_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_wstring_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_long_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_unsigned_long_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_short_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_unsigned_short_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_octet_struct;
 #define TC_Object_struct TC_CORBA_Object_struct
-extern struct CORBA_TypeCode_struct TC_CORBA_Object_struct;
-extern struct CORBA_TypeCode_struct TC_CORBA_any_struct;
-extern struct CORBA_TypeCode_struct TC_CORBA_TypeCode_struct;
-extern struct CORBA_TypeCode_struct TC_CORBA_boolean_struct;
-extern struct CORBA_TypeCode_struct TC_CORBA_float_struct;
-extern struct CORBA_TypeCode_struct TC_CORBA_double_struct;
-extern struct CORBA_TypeCode_struct TC_CORBA_long_double_struct;
-extern struct CORBA_TypeCode_struct TC_CORBA_long_long_struct;
-extern struct CORBA_TypeCode_struct TC_CORBA_unsigned_long_long_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_Object_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_any_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_TypeCode_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_boolean_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_float_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_double_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_long_double_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_long_long_struct;
+extern const struct CORBA_TypeCode_struct TC_CORBA_unsigned_long_long_struct;
 
 #ifdef ORBIT2_INTERNAL_API
 
Index: linc2/ChangeLog
===================================================================
RCS file: /cvs/gnome/ORBit2/linc2/ChangeLog,v
retrieving revision 1.228
diff -u -p -r1.228 ChangeLog
--- linc2/ChangeLog	27 Jan 2005 12:02:29 -0000	1.228
+++ linc2/ChangeLog	28 Jan 2005 04:50:02 -0000
@@ -1,3 +1,8 @@
+2005-01-27  Hans Petter Jansson  <hpj novell com>
+
+	* src/linc-compat.h: Include <sys/types.h> before the optional stuff.
+	Some platforms don't pull it in automatically when needed.
+
 2005-01-27  Tor Lillqvist  <tml novell com>
 
 	* src/linc-compat.h: Include <sys/utime.h> if that's where utime.h
Index: linc2/src/linc-compat.h
===================================================================
RCS file: /cvs/gnome/ORBit2/linc2/src/linc-compat.h,v
retrieving revision 1.9
diff -u -p -r1.9 linc-compat.h
--- linc2/src/linc-compat.h	27 Jan 2005 12:02:29 -0000	1.9
+++ linc2/src/linc-compat.h	28 Jan 2005 04:50:02 -0000
@@ -6,6 +6,8 @@
 #ifndef LINK_HACKS_H
 #define LINK_HACKS_H
 
+#include <sys/types.h>
+
 #ifdef HAVE_WINSOCK2_H
 #  include <winsock2.h>
 #else
@@ -35,7 +37,6 @@
 #  endif
 #endif
 
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #ifdef HAVE_UNISTD_H