diff -urN -x .build -x .inst -x .sinst ORBit2-2.12.0-orig/include/orbit/orb-core/corba-orb-type.h ORBit2-2.12.0/include/orbit/orb-core/corba-orb-type.h --- ORBit2-2.12.0-orig/include/orbit/orb-core/corba-orb-type.h 2003-04-04 02:40:35.000000000 +0100 +++ ORBit2-2.12.0/include/orbit/orb-core/corba-orb-type.h 2004-10-03 12:04:54.480486400 +0200 @@ -28,7 +28,7 @@ #define TC_IMPL_TC_CORBA_ORB_ObjectId_7 'e' #define TC_IMPL_TC_CORBA_ORB_ObjectId_8 'f' #define TC_IMPL_TC_CORBA_ORB_ObjectId_9 's' - extern const struct CORBA_TypeCode_struct TC_CORBA_ORB_ObjectId_struct; + extern struct CORBA_TypeCode_struct TC_CORBA_ORB_ObjectId_struct; #define TC_CORBA_ORB_ObjectId ((CORBA_TypeCode)&TC_CORBA_ORB_ObjectId_struct) #endif #define CORBA_ORB_ObjectId__freekids CORBA_string__freekids @@ -50,7 +50,7 @@ #define TC_IMPL_TC_CORBA_InterfaceDef_7 'e' #define TC_IMPL_TC_CORBA_InterfaceDef_8 'f' #define TC_IMPL_TC_CORBA_InterfaceDef_9 's' - extern const struct CORBA_TypeCode_struct TC_CORBA_InterfaceDef_struct; + extern struct CORBA_TypeCode_struct TC_CORBA_InterfaceDef_struct; #define TC_CORBA_InterfaceDef ((CORBA_TypeCode)&TC_CORBA_InterfaceDef_struct) #endif #endif diff -urN -x .build -x .inst -x .sinst ORBit2-2.12.0-orig/include/orbit/orb-core/corba-typecode.h ORBit2-2.12.0/include/orbit/orb-core/corba-typecode.h --- ORBit2-2.12.0-orig/include/orbit/orb-core/corba-typecode.h 2002-09-04 10:23:14.000000000 +0200 +++ ORBit2-2.12.0/include/orbit/orb-core/corba-typecode.h 2004-10-03 12:17:25.091019200 +0200 @@ -54,27 +54,27 @@ #define TC_CORBA_string ((CORBA_TypeCode)&TC_CORBA_string_struct) #define TC_CORBA_wstring ((CORBA_TypeCode)&TC_CORBA_wstring_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; +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; #define TC_Object_struct TC_CORBA_Object_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; +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; #ifdef ORBIT2_INTERNAL_API diff -urN -x .build -x .inst -x .sinst ORBit2-2.12.0-orig/src/idl-compiler/orbit-idl-c-headers.c ORBit2-2.12.0/src/idl-compiler/orbit-idl-c-headers.c --- ORBit2-2.12.0-orig/src/idl-compiler/orbit-idl-c-headers.c 2002-11-05 04:47:43.000000000 +0100 +++ ORBit2-2.12.0/src/idl-compiler/orbit-idl-c-headers.c 2004-10-03 11:14:14.196062400 +0200 @@ -634,7 +634,7 @@ fprintf (ci->fh, "#else\n"); fprintf (ci->fh, "extern\n"); fprintf (ci->fh, "#endif\n"); - fprintf (ci->fh, "const struct CORBA_TypeCode_struct TC_%s_struct;\n", ctmp); + fprintf (ci->fh, "struct CORBA_TypeCode_struct TC_%s_struct;\n", ctmp); fprintf (ci->fh, "#define TC_%s ((CORBA_TypeCode)&TC_%s_struct)\n", ctmp, ctmp); if (ci->do_impl_hack) diff -urN -x .build -x .inst -x .sinst ORBit2-2.12.0-orig/src/idl-compiler/orbit-idl-c-typecode.c ORBit2-2.12.0/src/idl-compiler/orbit-idl-c-typecode.c --- ORBit2-2.12.0-orig/src/idl-compiler/orbit-idl-c-typecode.c 2002-12-28 22:22:40.000000000 +0100 +++ ORBit2-2.12.0/src/idl-compiler/orbit-idl-c-typecode.c 2004-10-03 15:38:06.351777600 +0200 @@ -99,7 +99,7 @@ if (!IDL_TYPE_ENUM (node).enumerator_list) break; - fprintf (fh, "static const char *anon_subnames_array%d[] = {", subnames_id); + fprintf (fh, "static char *anon_subnames_array%d[] = {", subnames_id); for (l = IDL_TYPE_ENUM (node).enumerator_list; l; l = IDL_LIST (l).next) { g_assert (IDL_NODE_TYPE (IDL_LIST (l).data) == IDLN_IDENT); @@ -116,7 +116,7 @@ if (!IDL_TYPE_STRUCT (node).member_list) break; - fprintf (fh, "static const char *anon_subnames_array%d[] = {", subnames_id); + fprintf (fh, "static char *anon_subnames_array%d[] = {", subnames_id); for (l = IDL_TYPE_STRUCT (node).member_list; l; l = IDL_LIST (l).next) { IDL_tree dcl; @@ -148,7 +148,7 @@ if (!IDL_TYPE_UNION (node).switch_body) break; - fprintf (fh, "static const char * anon_subnames_array%d[] = {", subnames_id); + fprintf (fh, "static char * anon_subnames_array%d[] = {", subnames_id); for (l = IDL_TYPE_UNION (node).switch_body; l; l = IDL_LIST (l).next) { IDL_tree dcl, label; @@ -199,7 +199,7 @@ if (!IDL_TYPE_STRUCT (node).member_list) break; - fprintf (fh, "static const CORBA_TypeCode anon_subtypes_array%d[] = {", + fprintf (fh, "static CORBA_TypeCode anon_subtypes_array%d[] = {", subtypes_id); for (l = IDL_TYPE_STRUCT (node).member_list; l; l = IDL_LIST (l).next) { @@ -250,7 +250,7 @@ if (!IDL_TYPE_UNION (node).switch_body) break; - fprintf (fh, "static const CORBA_TypeCode anon_subtypes_array%d[] = {", subtypes_id); + fprintf (fh, "static CORBA_TypeCode anon_subtypes_array%d[] = {", subtypes_id); for (l = IDL_TYPE_UNION (node).switch_body; l; l = IDL_LIST (l).next) { IDL_tree label, dcl; @@ -293,7 +293,7 @@ seqts = orbit_cbe_get_typespec (IDL_TYPE_SEQUENCE (node).simple_type_spec); - fprintf (fh, "static const CORBA_TypeCode anon_subtypes_array%d[] = ", subtypes_id); + fprintf (fh, "static CORBA_TypeCode anon_subtypes_array%d[] = ", subtypes_id); switch (IDL_NODE_TYPE (seqts)) { case IDLN_INTERFACE: @@ -317,7 +317,7 @@ break; case IDLN_TYPE_ARRAY: case IDLN_IDENT: - fprintf (fh, "static const CORBA_TypeCode anon_subtypes_array%d[] = ", subtypes_id); + fprintf (fh, "static CORBA_TypeCode anon_subtypes_array%d[] = ", subtypes_id); fprintf (fh, "{(CORBA_TypeCode)&%s_struct};\n", substructname); break; default: @@ -338,7 +338,7 @@ !IDL_TYPE_UNION (node).switch_body) return default_index; - fprintf (fh, "static const CORBA_long anon_sublabels_array%d[] = {", sublabels_id); + fprintf (fh, "static CORBA_long anon_sublabels_array%d[] = {", sublabels_id); for (l = IDL_TYPE_UNION (node).switch_body; l; l = IDL_LIST (l).next) for (label = IDL_CASE_STMT (IDL_LIST (l).data).labels; label; @@ -968,7 +968,7 @@ fprintf (ci->fh, "#endif\n"); } - fprintf (ci->fh, "const struct CORBA_TypeCode_struct %s_struct = {\n", + fprintf (ci->fh, "struct CORBA_TypeCode_struct %s_struct = {\n", tci->structname); orbit_output_tcstruct_parent (ci->fh); diff -urN -x .build -x .inst -x .sinst ORBit2-2.12.0-orig/src/idl-compiler/orbit-idl-main.c ORBit2-2.12.0/src/idl-compiler/orbit-idl-main.c --- ORBit2-2.12.0-orig/src/idl-compiler/orbit-idl-main.c 2003-09-30 13:55:14.000000000 +0200 +++ ORBit2-2.12.0/src/idl-compiler/orbit-idl-main.c 2004-10-03 12:12:06.078889600 +0200 @@ -107,8 +107,7 @@ {NULL, '\0', 0, NULL, 0, NULL, NULL} }; -static const -struct poptOption options[] = { +static struct poptOption options[] = { {NULL, '\0', POPT_ARG_INCLUDE_TABLE, &cl_cpp_callback_options, 0, NULL, NULL}, {NULL, '\0', POPT_ARG_INCLUDE_TABLE, &cl_libIDL_callback_options, 0, NULL, NULL}, {"version", 'v', POPT_ARG_NONE, &cl_output_version, 0, "Output compiler version and serial", NULL}, diff -urN -x .build -x .inst -x .sinst ORBit2-2.12.0-orig/src/orb/orb-core/corba-typecode.c ORBit2-2.12.0/src/orb/orb-core/corba-typecode.c --- ORBit2-2.12.0-orig/src/orb/orb-core/corba-typecode.c 2003-10-08 00:31:56.000000000 +0200 +++ ORBit2-2.12.0/src/orb/orb-core/corba-typecode.c 2004-10-03 12:33:16.422192000 +0200 @@ -61,7 +61,7 @@ } TkInfo; #define DEF_TC_BASIC(nom, c_align) \ - const struct CORBA_TypeCode_struct TC_CORBA_##nom##_struct = { \ + struct CORBA_TypeCode_struct TC_CORBA_##nom##_struct = { \ {&ORBit_TypeCode_epv, ORBIT_REFCOUNT_STATIC}, \ CORBA_tk_##nom, \ 0, 0, c_align, \ @@ -78,13 +78,13 @@ #define CORBA_tk_unsigned_short CORBA_tk_ushort #define CORBA_tk_long_double CORBA_tk_longdouble -const struct CORBA_TypeCode_struct TC_null_struct = { +struct CORBA_TypeCode_struct TC_null_struct = { {&ORBit_TypeCode_epv, ORBIT_REFCOUNT_STATIC}, CORBA_tk_null, 0, 0, -1, 0, 0, NULL, CORBA_OBJECT_NIL, "null", "IDL:omg.org/CORBA/Null:1.0" }; -const struct CORBA_TypeCode_struct TC_void_struct = { +struct CORBA_TypeCode_struct TC_void_struct = { {&ORBit_TypeCode_epv, ORBIT_REFCOUNT_STATIC}, CORBA_tk_void, 0, 0, -1, 0, 0, NULL, CORBA_OBJECT_NIL, "void", "IDL:omg.org/CORBA/void:1.0"