Re: i18n broken on mingw cross compile

[ludo@gnu.org (Ludovic Courtès)]

[-- Attachment #1: Type: text/plain, Size: 887 bytes --]

Hi,

ludo@gnu.org (Ludovic Courtès) writes:

> Han-Wen Nienhuys <hanwen@xs4all.nl> writes:
>
>> In file included from /home/lilydev/vc/gub/target/mingw/root/usr/include/sys/time.h:3,
>>                  from ../libguile/scmconfig.h:25,
>>                  from /home/lilydev/vc/gub/target/mingw/src/guile-1.9.git/libguile/__scm.h:52,
>>                  from /home/lilydev/vc/gub/target/mingw/src/guile-1.9.git/libguile.h:30,
>>                  from /home/lilydev/vc/gub/target/mingw/src/guile-1.9.git/libguile/discouraged.c:22:
>> ../lib/time.h:76: error: expected ';', ',' or ')' before '__timer'
>> ../lib/time.h:78: error: expected ';', ',' or ')' before '__timer'
>
> Reported here:
>
>   http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/14574

Actually, as suggested by Eric Blake, this is probably fixed by the
attached patch (committed).  Can you confirm it?

Thanks,
Ludo'.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: The patch --]
[-- Type: text/x-patch, Size: 1231 bytes --]

From 1778e9f5fba27a08af73c2757e16ba01ac1d1c23 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 12 Sep 2008 09:41:54 +0200
Subject: [PATCH] Include <config.h> in `discouraged.c'.

* libguile/discouraged.c: Include <config.h> first so that files that
  rely on `config.h' macros (such as Gnulib-provided headers) work as
  expected.
---
 libguile/discouraged.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libguile/discouraged.c b/libguile/discouraged.c
index 07663e0..3ffbed1 100644
--- a/libguile/discouraged.c
+++ b/libguile/discouraged.c
@@ -2,7 +2,7 @@
    discourage something, move it here when that is feasible.
 */
 
-/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 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
@@ -19,7 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libguile.h"
+#if HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <libguile.h>
+
 
 #if (SCM_ENABLE_DISCOURAGED == 1)
 
-- 
1.6.0