Re: i18n broken on mingw cross compile

[Ludovic Courtès]

Hi,

Han-Wen Nienhuys <address@hidden> writes:

> i686-mingw32-gcc -mms-bitfields -DHAVE_CONFIG_H 
> -I/home/lilydev/vc/gub/target/mingw/src/guile-1.9.git -I.. 
> -I/home/lilydev/vc/gub/target/mingw/src/guile-1.9.git/lib -I../lib -Wall 
> -Wmissing-prototypes -g -O2 -MT libguile_i18n_v_0_la-i18n.lo -MD -MP -MF 
> .deps/libguile_i18n_v_0_la-i18n.Tpo -c 
> /home/lilydev/vc/gub/target/mingw/src/guile-1.9.git/libguile/i18n.c  
> -DDLL_EXPORT -DPIC -o .libs/libguile_i18n_v_0_la-i18n.o
> In file included from 
> /home/lilydev/vc/gub/target/mingw/src/guile-1.9.git/libguile/i18n.c:296:
> /home/lilydev/vc/gub/target/mingw/src/guile-1.9.git/libguile/locale-categories.h:
>  In function 'get_current_locale_settings':
> /home/lilydev/vc/gub/target/mingw/src/guile-1.9.git/libguile/locale-categories.h:24:
>  error: 'LC_MESSAGES' undeclared (first use in this function)
> /home/lilydev/vc/gub/target/mingw/src/guile-1.9.git/libguile/locale-categories.h:24:
>  error: (Each undeclared identifier is reported only once
> /home/lilydev/vc/gub/target/mingw/src/guile-1.9.git/libguile/locale-categories.h:24:
>  error: for each function it appears in.)

Can you try out the attached patch?

> does this ring a bell with anyone?  This was working with
>
>   release_1-8-5

Certainly not: there's no such code in 1.8.

Thanks,
Ludo'.

diff --git a/libguile/locale-categories.h b/libguile/locale-categories.h
index cec91fb..cbe9684 100644
--- a/libguile/locale-categories.h
+++ b/libguile/locale-categories.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2006, 2008 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,7 +21,12 @@
 /* The six standard categories, as defined in IEEE Std 1003.1-2001.  */
 SCM_DEFINE_LOCALE_CATEGORY (COLLATE)
 SCM_DEFINE_LOCALE_CATEGORY (CTYPE)
+
+#ifdef LC_MESSAGES
+/* MinGW doesn't have `LC_MESSAGES'.  */
 SCM_DEFINE_LOCALE_CATEGORY (MESSAGES)
+#endif
+
 SCM_DEFINE_LOCALE_CATEGORY (MONETARY)
 SCM_DEFINE_LOCALE_CATEGORY (NUMERIC)
 SCM_DEFINE_LOCALE_CATEGORY (TIME)