win32: move function redefinitions to mingw.h

The itoa and strrev functions have different prototypes in BusyBox
and WIN32.  Move the #defines which handle this to mingw.h, reducing
differences between busybox-w32 and upstream.

3 files changed, 9 insertions, 6 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 0a333dca8..90fdd1178 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1010,9 +1010,6 @@ char *safe_gethostname(void) FAST_FUNC;
 char* str_tolower(char *str) FAST_FUNC;
 
 char *utoa(unsigned n) FAST_FUNC;
-#if ENABLE_PLATFORM_MINGW32
-# define itoa bb_itoa
-#endif
 char *itoa(int n) FAST_FUNC;
 /* Returns a pointer past the formatted number, does NOT null-terminate */
 char *utoa_to_buf(unsigned n, char *buf, unsigned buflen) FAST_FUNC;
diff --git a/include/mingw.h b/include/mingw.h
index 7ee9c15cc..025c4e22b 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -419,6 +419,12 @@ DIR *mingw_opendir(const char *path);
 #define opendir mingw_opendir
 
 /*
+ * Functions with different prototypes in BusyBox and WIN32
+ */
+#define itoa bb_itoa
+#define strrev bb_strrev
+
+/*
  * MinGW specific
  */
 #define is_dir_sep(c) ((c) == '/' || (c) == '\\')
diff --git a/util-linux/rev.c b/util-linux/rev.c
index b0a0c01aa..c90b4bbaf 100644
--- a/util-linux/rev.c
+++ b/util-linux/rev.c
@@ -31,7 +31,7 @@
 #endif
 
 /* In-place invert */
-static void bb_strrev(CHAR_T *s, int len)
+static void strrev(CHAR_T *s, int len)
 {
         int i;
 
@@ -103,14 +103,14 @@ int rev_main(int argc UNUSED_PARAM, char **argv)
                                 /* Convert to wchar_t (might error out!) */
                                 int len  = mbstowcs(tmp, buf, bufsize);
                                 if (len >= 0) {
-                                        bb_strrev(tmp, len);
+                                        strrev(tmp, len);
                                         /* Convert back to char */
                                         wcstombs(buf, tmp, bufsize);
                                 }
                                 free(tmp);
                         }
 #else
-                        bb_strrev(buf, strlen(buf));
+                        strrev(buf, strlen(buf));
 #endif
                         fputs(buf, stdout);
                 }