win32: fix euro symbol handling

Commit 2b4dbe5fa (libbb: speed up bb_get_chunk_from_file()) speeded
up grep by a factor of two.  However, it introduced a call to
OemToCharBuff() in bb_get_chunk_from_file() which didn't have the
fix for the euro symbol from commit 93a63809f9 (win32: add support
for the euro currency symbol).

Export the fixed version of OemToCharBuff() and use it.

Saves 8 bytes (64-bit), adds 28 bytes (32-bit)

2 files changed, 6 insertions, 3 deletions

diff --git a/include/mingw.h b/include/mingw.h
index e937a9e3c..22c59f483 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -150,6 +150,7 @@ IMPL(setlinebuf, void, ,FILE * UNUSED_PARAM)
  * ANSI emulation wrappers
  */
 
+BOOL winansi_OemToCharBuff(LPCSTR s, LPSTR d, DWORD len);
 void set_title(const char *str);
 void move_cursor_row(int n);
 void reset_screen(void);
@@ -165,6 +166,10 @@ int winansi_fprintf(FILE *stream, const char *format, ...) __attribute__((format
 int winansi_write(int fd, const void *buf, size_t count);
 int winansi_read(int fd, void *buf, size_t count);
 int winansi_getc(FILE *stream);
+#if ENABLE_FEATURE_EURO
+# undef OemToCharBuff
+# define OemToCharBuff winansi_OemToCharBuff
+#endif
 #define putchar winansi_putchar
 #define puts winansi_puts
 #define fwrite winansi_fwrite
diff --git a/win32/winansi.c b/win32/winansi.c
index dbdba9626..14fbee75f 100644
--- a/win32/winansi.c
+++ b/win32/winansi.c
@@ -746,7 +746,7 @@ static BOOL winansi_CharToOem(LPCSTR s, LPSTR d)
         return winansi_CharToOemBuff(s, d, strlen(s)+1);
 }
 
-static BOOL winansi_OemToCharBuff(LPCSTR s, LPSTR d, DWORD len)
+BOOL winansi_OemToCharBuff(LPCSTR s, LPSTR d, DWORD len)
 {
         WCHAR *buf;
         int i;
@@ -771,10 +771,8 @@ static BOOL winansi_OemToCharBuff(LPCSTR s, LPSTR d, DWORD len)
 
 # undef CharToOemBuff
 # undef CharToOem
-# undef OemToCharBuff
 # define CharToOemBuff winansi_CharToOemBuff
 # define CharToOem winansi_CharToOem
-# define OemToCharBuff winansi_OemToCharBuff
 #endif
 
 static int ansi_emulate(const char *s, FILE *stream)