This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Re: egcs & texinfo/config.h.in (fwd)


I sent this patch to the list some months ago.  It should be applied to the
main tree.

----- Forwarded message from Philippe De Muyter -----

> Yup.  Unfortunately, it broke bootstrapping with cc on IRIX; getopt.c
> wouldn't include libintl.h, and cc would complain about being unable
> to convert int (the assumed return type of gettext) to char*.
> 
> The attached patch fixes this problem.  Ok to install?
> 
I'd rather use the following one : this one matches the current sources
of texinfo.

Wed Jun 30 20:12:01 1999  Philippe De Muyter  <phdm@macqel.be>

	* acconfig.h (_, N_): Macros removed.
	* lib/system.h (_, N_): Macro definitions moved here.
	* config.h.in: File regenerated.

--- ./texinfo/lib/system.h	Wed Jun 30 20:15:16 1999
+++ ./texinfo/lib/system.h	Wed Jun 30 20:15:01 1999
@@ -37,7 +37,11 @@
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif
+
+/* For gettext (NLS).  */
 #include <libintl.h>
+#define _(String) gettext (String)
+#define N_(String) (String)
 
 /* Don't use bcopy!  Use memmove if source and destination may overlap,
    memcpy otherwise.  */
--- ./texinfo/acconfig.h	Wed Jun 30 20:15:16 1999
+++ ./texinfo/acconfig.h	Wed Jun 30 20:13:00 1999
@@ -39,10 +39,6 @@
 
 @BOTTOM@
 
-/* For gettext (NLS) */
-#define _(String) gettext (String)
-#define N_(String) (String)
-
 
 /* Leave that blank line there!!  Autoheader needs it.
    If you're adding to this file, keep in mind:

----- End of forwarded message from Philippe De Muyter -----


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]