2009-11-24 Carles Pina i Estany <carles@pina.cat>

	* conf/i386-coreboot.rmk (kernel_img_HEADERS): Add i18n.h.
	* conf/i386-efi.rmk: Likewise.
	* conf/i386-ieee1275.rmk: Likewise.
	* conf/i386-pc.rmk: Likewise.
	* conf/powerpc-ieee1275.rmk: Likewise.
	* conf/sparc64-ieee1275.rmk: Likewise.
	* conf/x86_64-efi.rmk: Likewise.
	* gettext/gettex.c: Include <grub/i18n.h>.
	* include/grub/misc.h (grub_gettext_dummy, grub_gettext): Move from
 	  here ...
	* include/grub/i18n.h: ... to here
	* include/grub/i18n.h: ... to here.
	* kern/misc.c: Include <grub/i18n.h>
	(grub_gettext_dummy): Move above user.

diff --git a/ChangeLog b/ChangeLog
index 683b708cc6f3fafea6625ac9cac2d1719528eb76..46c71e6f5bbaaa1bd95cf0c0ec5d9f78dbdd1226 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2009-11-24  Carles Pina i Estany <carles@pina.cat>
+
+       * conf/i386-coreboot.rmk (kernel_img_HEADERS): Add i18n.h.
+       * conf/i386-efi.rmk: Likewise.
+       * conf/i386-ieee1275.rmk: Likewise.
+       * conf/i386-pc.rmk: Likewise.
+       * conf/powerpc-ieee1275.rmk: Likewise.
+       * conf/sparc64-ieee1275.rmk: Likewise.
+       * conf/x86_64-efi.rmk: Likewise.
+       * gettext/gettex.c: Include <grub/i18n.h>.
+       * include/grub/misc.h (grub_gettext_dummy, grub_gettext): Move from
+         here ...
+       * include/grub/i18n.h: ... to here
+       * include/grub/i18n.h: ... to here.
+       * kern/misc.c: Include <grub/i18n.h>
+       (grub_gettext_dummy): Move above user. 
+
 2009-11-24  Felix Zielcke  <fzielcke@z-51.de>
 
        * util/Makefile.in (install-local): Convert a `for' into a normal

diff --git a/conf/i386-coreboot.rmk b/conf/i386-coreboot.rmk
index 33a477573dbd9734d5f85f6cfd6d78a732cc4b1c..2a9073ef51de571e1ba17c2b1f58ca2a20fe8fa5 100644 (file)
--- a/conf/i386-coreboot.rmk
+++ b/conf/i386-coreboot.rmk
@@ -34,7 +34,7 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
        env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
        machine/boot.h machine/console.h machine/init.h \
-       machine/memory.h machine/loader.h list.h handler.h command.h
+       machine/memory.h machine/loader.h list.h handler.h command.h i18n.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR),-Bstatic
@@ -77,7 +77,7 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
        env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
        machine/boot.h machine/console.h machine/init.h \
-       machine/memory.h machine/loader.h list.h handler.h command.h
+       machine/memory.h machine/loader.h list.h handler.h command.h i18n.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS) -DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS) -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR)

diff --git a/conf/i386-efi.rmk b/conf/i386-efi.rmk
index ac88ebd42dcc628fdd8e3d5367cee7ac872b0641..80c2978da26f39a681185e39ca973998cdad5f15 100644 (file)
--- a/conf/i386-efi.rmk
+++ b/conf/i386-efi.rmk
@@ -56,7 +56,7 @@ kernel_mod_SOURCES = kern/i386/efi/startup.S kern/main.c kern/device.c \
 kernel_mod_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
        env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-       efi/efi.h efi/time.h efi/disk.h i386/pit.h list.h handler.h command.h
+       efi/efi.h efi/time.h efi/disk.h i386/pit.h list.h handler.h command.h i18n.h
 kernel_mod_CFLAGS = $(COMMON_CFLAGS)
 kernel_mod_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_mod_LDFLAGS = $(COMMON_LDFLAGS)

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 2df3421f79f40896eabf17895fb29e9840a12f12..5648936660d041cf4421667b618a7eda7c7ccb8b 100644 (file)
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -33,7 +33,7 @@ kernel_img_HEADERS = cache.h device.h disk.h dl.h elf.h elfload.h \
        env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
        ieee1275/ieee1275.h machine/kernel.h machine/loader.h machine/memory.h \
-       list.h handler.h command.h
+       list.h handler.h command.h i18n.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x10000,-Bstatic

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index b100d94e2f8335bd338b6ea57e5ae82dcb9bfe32..2b0894eae2d6c556daf57f6d9b2921ca4745ba90 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -64,7 +64,7 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
        machine/biosdisk.h machine/boot.h machine/console.h machine/init.h \
        machine/memory.h machine/loader.h machine/vga.h machine/vbe.h \
-       machine/kernel.h machine/pxe.h i386/pit.h list.h handler.h command.h
+       machine/kernel.h machine/pxe.h i386/pit.h list.h handler.h command.h i18n.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index 0a87a6a5df3419a680b4c557b797d893047568cf..6427f6bbd39eb05b3df3099e424884be4726a684 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -17,7 +17,7 @@ kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
        env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
        symbol.h term.h time.h types.h powerpc/libgcc.h loader.h partition.h \
        msdos_partition.h ieee1275/ieee1275.h machine/kernel.h handler.h list.h \
-       command.h
+       command.h i18n.h
 
 symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
        /bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)

diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk
index 3abddf511134c670ab89257df9918bbba7068fcc..900b70e3c639692d2ddc49ba0f5426756b8615a5 100644 (file)
--- a/conf/sparc64-ieee1275.rmk
+++ b/conf/sparc64-ieee1275.rmk
@@ -29,7 +29,7 @@ DEFSYMFILES += kernel_syms.lst
 kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
        env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
-       list.h handler.h command.h \
+       list.h handler.h command.h i18n.h \
        sparc64/libgcc.h ieee1275/ieee1275.h machine/kernel.h \
        sparc64/ieee1275/ieee1275.h
 kernel_img_SOURCES = kern/sparc64/ieee1275/crt0.S kern/ieee1275/cmain.c        \

diff --git a/conf/x86_64-efi.rmk b/conf/x86_64-efi.rmk
index 3d519e955a9e273c5da96f4202ff49c9ed56fb0e..3b7ac34fa79eb56ad33b3a6b7c45c8121fd35d81 100644 (file)
--- a/conf/x86_64-efi.rmk
+++ b/conf/x86_64-efi.rmk
@@ -56,7 +56,7 @@ kernel_mod_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
        env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
        partition.h msdos_partition.h reader.h symbol.h term.h time.h types.h \
        efi/efi.h efi/time.h efi/disk.h machine/loader.h i386/pit.h list.h \
-       handler.h command.h
+       handler.h command.h i18n.h
 kernel_mod_CFLAGS = $(COMMON_CFLAGS)
 kernel_mod_ASFLAGS = $(COMMON_ASFLAGS)
 kernel_mod_LDFLAGS = $(COMMON_LDFLAGS)

diff --git a/gettext/gettext.c b/gettext/gettext.c
index 5c1279dc33be6832089632fe3483cd0080e58c8a..856265e6f47a534e01168a72c8ab28078c592622 100644 (file)
--- a/gettext/gettext.c
+++ b/gettext/gettext.c
@@ -26,6 +26,7 @@
 #include <grub/file.h>
 #include <grub/kernel.h>
 #include <grub/gzio.h>
+#include <grub/i18n.h>
 
 /* 
    .mo file information from: 

diff --git a/include/grub/i18n.h b/include/grub/i18n.h
index e4e06e9cd0f805b3a1a84148cb9f4dff859d71cd..f6f4687443e07517dbba674f9cecca43c80678d4 100644 (file)
--- a/include/grub/i18n.h
+++ b/include/grub/i18n.h
@@ -25,6 +25,10 @@
 # define _(str) gettext(str)
 #else
 # define _(str) grub_gettext(str)
+
+const char *EXPORT_FUNC(grub_gettext_dummy) (const char *s);
+extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
+
 #endif
 
 #define N_(str) str

diff --git a/include/grub/misc.h b/include/grub/misc.h
index 8ec8ad822da753ebfff6f751877d94dbea65d6d0..31d4ddf857f0596c34c90e2f66da156bbb7cc1ab 100644 (file)
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -191,9 +191,6 @@ grub_ssize_t EXPORT_FUNC(grub_utf8_to_ucs4) (grub_uint32_t *dest,
 grub_uint64_t EXPORT_FUNC(grub_divmod64) (grub_uint64_t n,
                                          grub_uint32_t d, grub_uint32_t *r);
 
-const char *EXPORT_FUNC(grub_gettext_dummy) (const char *s);
-extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
-
 #ifdef NEED_ENABLE_EXECUTE_STACK
 void EXPORT_FUNC(__enable_execute_stack) (void *addr);
 #endif

diff --git a/kern/misc.c b/kern/misc.c
index 827f864c44e9732f8646c0b21f7fecbc65881c5f..9f9a3ae652087741d0cae752e54549f1fbf15f7a 100644 (file)
--- a/kern/misc.c
+++ b/kern/misc.c
@@ -23,6 +23,7 @@
 #include <stdarg.h>
 #include <grub/term.h>
 #include <grub/env.h>
+#include <grub/i18n.h>
 
 static int
 grub_iswordseparator (int c)
@@ -30,6 +31,13 @@ grub_iswordseparator (int c)
   return (grub_isspace (c) || c == ',' || c == ';' || c == '|' || c == '&');
 }
 
+/* grub_gettext_dummy is not translating anything.  */
+const char *
+grub_gettext_dummy (const char *s)
+{
+  return s;
+}
+
 const char* (*grub_gettext) (const char *s) = grub_gettext_dummy;
 
 void *
@@ -986,13 +994,6 @@ grub_utf8_to_ucs4 (grub_uint32_t *dest, grub_size_t destsize,
   return p - dest;
 }
 
-/* grub_gettext_dummy is not translating anything.  */
-const char *
-grub_gettext_dummy (const char *s)
-{
-  return s;
-}
-
 /* Abort GRUB. This function does not return.  */
 void
 grub_abort (void)