[patch] fixes to get ORBit building again on my system



I had to make the following fixes to make ORBit work on my system
again after upgrading to autoconf 1.52.

Is it OK to commit these?

Index: configure.in
===================================================================
RCS file: /cvs/gnome/ORBit/configure.in,v
retrieving revision 1.98.4.12
diff -p -u -r1.98.4.12 configure.in
--- configure.in	2001/09/11 22:25:36	1.98.4.12
+++ configure.in	2001/09/12 23:13:10
@@ -126,7 +126,7 @@ AC_TYPE_SIZE_T
 dnl Checks for library functions.
 AC_FUNC_VPRINTF
 AC_FUNC_ALLOCA
-if test $ac_cv_header_alloca_h = yes; then
+if test x$ac_cv_header_alloca_h = xyes; then
 	ORBIT_HAVE_ALLOCA_H=1
 else
 	ORBIT_HAVE_ALLOCA_H=0
Index: popt/acconfig.h
===================================================================
RCS file: /cvs/gnome/popt/acconfig.h,v
retrieving revision 1.3
diff -p -u -r1.3 acconfig.h
--- popt/acconfig.h	1999/09/29 21:12:45	1.3
+++ popt/acconfig.h	2001/09/12 23:13:10
@@ -16,7 +16,7 @@
    a given entry is in the file.
 
    Leave the following blank line there!!  Autoheader needs it.  */
-^L
+
 
 /* Define to the name of the distribution.  */
 #undef PACKAGE
@@ -42,7 +42,7 @@
 /* Define to 1 if you have the stpcpy function.  */
 #undef HAVE_STPCPY
 
-^L
+
 /* Leave that blank line there!!  Autoheader needs it.
    If you're adding to this file, keep in mind:
    The entries are in sort -df order: alphabetical, case insensitive,
Index: src/IIOP/iiop-endian.h
===================================================================
RCS file: /cvs/gnome/ORBit/src/IIOP/iiop-endian.h,v
retrieving revision 1.16.4.1
diff -p -u -r1.16.4.1 iiop-endian.h
--- src/IIOP/iiop-endian.h	2001/09/11 22:25:38	1.16.4.1
+++ src/IIOP/iiop-endian.h	2001/09/12 23:13:10
@@ -25,16 +25,20 @@
 /* This is also defined in IIOP-types.c */
 
 /* If we can't do inlining or we don't want the inlined version, provide
- * this prototype.  Otherwise, hide it, so only the inlined version is
- * visible.
+ * this prototype. Otherwise, we need a prototype that specifies G_INLINE_FUNC.
  */
 #if !defined(G_CAN_INLINE) || defined(IIOP_DO_NOT_INLINE_IIOP_BYTESWAP)
+
 void iiop_byteswap(guchar *outdata,
 		   const guchar *data,
 		   gulong datalen);
-#endif
+
+#else
+
+G_INLINE_FUNC void iiop_byteswap(guchar *outdata,
+				 const guchar *data,
+				 gulong datalen);
 
-#if defined(G_CAN_INLINE) && !defined(IIOP_DO_NOT_INLINE_IIOP_BYTESWAP)
 G_INLINE_FUNC void iiop_byteswap(guchar *outdata,
 				 const guchar *data,
 				 gulong datalen)
@@ -44,6 +48,7 @@ G_INLINE_FUNC void iiop_byteswap(guchar 
   while(dest_ptr >= outdata)
     *dest_ptr-- = *source_ptr++;
 }
+
 #endif
 
 #endif
Index: src/orbit-idl-compiler/backends/c/orbit-idl-c-skels.c
===================================================================
RCS file: /cvs/gnome/ORBit/src/orbit-idl-compiler/backends/c/orbit-idl-c-skels.c,v
retrieving revision 1.9.4.6
diff -p -u -r1.9.4.6 orbit-idl-c-skels.c
--- src/orbit-idl-compiler/backends/c/orbit-idl-c-skels.c	2001/03/15 09:27:35	1.9.4.6
+++ src/orbit-idl-compiler/backends/c/orbit-idl-c-skels.c	2001/09/12 23:13:12
@@ -25,6 +25,7 @@ orbit_idl_output_c_skeletons(OIDL_Output
   		   " * This file was generated by orbit-idl - DO NOT EDIT!\n"
 		   " */\n\n");
   fprintf(ci->fh, "#include <string.h>\n");
+  fprintf(ci->fh, "#include <alloca.h>\n");
   fprintf(ci->fh, "#include \"%s.h\"\n\n", ci->base_name);
 
   ck_output_skels(tree->tree, ci);
Index: src/orbit-idl-compiler/backends/c/orbit-idl-c-stubs.c
===================================================================
RCS file: /cvs/gnome/ORBit/src/orbit-idl-compiler/backends/c/orbit-idl-c-stubs.c,v
retrieving revision 1.22.4.4
diff -p -u -r1.22.4.4 orbit-idl-c-stubs.c
--- src/orbit-idl-compiler/backends/c/orbit-idl-c-stubs.c	2001/01/28 22:17:50	1.22.4.4
+++ src/orbit-idl-compiler/backends/c/orbit-idl-c-stubs.c	2001/09/12 23:13:13
@@ -13,6 +13,7 @@ orbit_idl_output_c_stubs(OIDL_Output_Tre
   		   " * This file was generated by orbit-idl - DO NOT EDIT!\n"
 		   " */\n\n");
   fprintf(ci->fh, "#include <string.h>\n");
+  fprintf(ci->fh, "#include <alloca.h>\n");
   fprintf(ci->fh, "#include \"%s.h\"\n\n", ci->base_name);
 
   cs_output_stubs(tree->tree, ci);
===================================================================

    -- Darin




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]