Mercurial > hg > xemacs-beta
changeset 2200:35540b6052a9
[xemacs-hg @ 2004-08-03 22:08:46 by james]
Move the definition of gettext after #include "lisp.h".
| author | james |
|---|---|
| date | Tue, 03 Aug 2004 22:08:48 +0000 |
| parents | 8c0dc9adc2b5 |
| children | 8e39301eac59 |
| files | src/ChangeLog src/regex.c |
| diffstat | 2 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Aug 03 21:50:30 2004 +0000 +++ b/src/ChangeLog Tue Aug 03 22:08:48 2004 +0000 @@ -1,3 +1,8 @@ +2004-08-03 Jerry James <james@xemacs.org> + + * regex.c: Move #define gettext after #include "lisp.h" to avoid + breaking the C++ build on Fedora systems. + 2004-07-27 Malcolm Purvis <malcolmp@xemacs.org> * frame-gtk.c (gtk_make_frame_visible):
--- a/src/regex.c Tue Aug 03 21:50:30 2004 +0000 +++ b/src/regex.c Tue Aug 03 22:08:48 2004 +0000 @@ -45,13 +45,6 @@ #include <sys/types.h> #include <stddef.h> /* needed for ptrdiff_t under Solaris */ -/* This is for other GNU distributions with internationalized messages. */ -#if defined (I18N3) && (defined (HAVE_LIBINTL_H) || defined (_LIBC)) -# include <libintl.h> -#else -# define gettext(msgid) (msgid) -#endif - /* XEmacs addition */ #ifdef REL_ALLOC #define REGEX_REL_ALLOC /* may be undefined below */ @@ -125,6 +118,13 @@ #include <string.h> +/* This is for other GNU distributions with internationalized messages. */ +#if defined (I18N3) && (defined (HAVE_LIBINTL_H) || defined (_LIBC)) +# include <libintl.h> +#else +# define gettext(msgid) (msgid) +#endif + /* Define the syntax stuff for \<, \>, etc. */ /* This must be nonzero for the wordchar and notwordchar pattern