4 files changed, 562 insertions, 2 deletions

diff --git a/include/bb_archive.h b/include/bb_archive.h
index 2b9c5f04c..9bbf59bb8 100644
--- a/include/bb_archive.h
+++ b/include/bb_archive.h
@@ -2,6 +2,16 @@
 #ifndef UNARCHIVE_H
 #define UNARCHIVE_H 1
 
+#if !defined(BB_ARCHIVE_PUBLIC) && ENABLE_PLATFORM_MINGW32
+/* treat mingw as a non-MMU platform */
+#undef BB_MMU
+#undef USE_FOR_NOMMU
+#undef USE_FOR_MMU
+#define BB_MMU 0
+#define USE_FOR_NOMMU(...) __VA_ARGS__
+#define USE_FOR_MMU(...)
+#endif
+
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
 enum {
diff --git a/include/libbb.h b/include/libbb.h
index abdc8c2b8..0b9cfb585 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -138,6 +138,12 @@
 # include <arpa/inet.h>
 #elif defined __APPLE__
 # include <netinet/in.h>
+#elif ENABLE_PLATFORM_MINGW32
+# ifndef WINVER
+#  define WINVER 0x0501
+# endif
+# include <winsock2.h>
+# include <ws2tcpip.h>
 #else
 # include <arpa/inet.h>
 //This breaks on bionic:
@@ -166,7 +172,9 @@
 
 /* Some libc's forget to declare these, do it ourself */
 
+#if !ENABLE_PLATFORM_MINGW32
 extern char **environ;
+#endif
 #if defined(__GLIBC__) && __GLIBC__ < 2
 int vdprintf(int d, const char *format, va_list ap);
 #endif
@@ -179,6 +187,9 @@ int klogctl(int type, char *b, int len);
 # define BUFSIZ 4096
 #endif
 
+#if ENABLE_PLATFORM_MINGW32
+# include "mingw.h"
+#endif
 
 /* Busybox does not use threads, we can speed up stdio. */
 #ifdef HAVE_UNLOCKED_STDIO
@@ -490,6 +501,7 @@ enum {
                 + (1LL << SIGUSR2)
                 + 0),
 };
+#if !ENABLE_PLATFORM_MINGW32
 void bb_signals(int sigs, void (*f)(int)) FAST_FUNC;
 /* Unlike signal() and bb_signals, sets handler with sigaction()
  * and in a way that while signal handler is run, no other signals
@@ -507,6 +519,10 @@ void sig_unblock(int sig) FAST_FUNC;
 int sigaction_set(int sig, const struct sigaction *act) FAST_FUNC;
 /* SIG_BLOCK/SIG_UNBLOCK all signals: */
 int sigprocmask_allsigs(int how) FAST_FUNC;
+#else
+#define bb_signals(s, f)
+#define kill_myself_with_sig(s)
+#endif
 /* Standard handler which just records signo */
 extern smallint bb_got_signal;
 void record_signo(int signo); /* not FAST_FUNC! */
@@ -586,7 +602,7 @@ char *strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp) FAST_FUNC;
 int xsocket(int domain, int type, int protocol) FAST_FUNC;
 void xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen) FAST_FUNC;
 void xlisten(int s, int backlog) FAST_FUNC;
-void xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen) FAST_FUNC;
+void xconnect(int s, const struct sockaddr *saddr, socklen_t addrlen) FAST_FUNC;
 ssize_t xsendto(int s, const void *buf, size_t len, const struct sockaddr *to,
                                 socklen_t tolen) FAST_FUNC;
 
@@ -890,6 +906,9 @@ 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;
@@ -1664,6 +1683,9 @@ typedef struct procps_status_t {
 #if ENABLE_FEATURE_TOP_SMP_PROCESS
         int last_seen_on_cpu;
 #endif
+#if ENABLE_PLATFORM_MINGW32
+        HANDLE snapshot;
+#endif
 } procps_status_t;
 /* flag bits for procps_scan(xx, flags) calls */
 enum {
@@ -1702,7 +1724,11 @@ void free_procps_scan(procps_status_t* sp) FAST_FUNC;
 procps_status_t* procps_scan(procps_status_t* sp, int flags) FAST_FUNC;
 /* Format cmdline (up to col chars) into char buf[size] */
 /* Puts [comm] if cmdline is empty (-> process is a kernel thread) */
+#if !ENABLE_PLATFORM_MINGW32
 void read_cmdline(char *buf, int size, unsigned pid, const char *comm) FAST_FUNC;
+#else
+#define read_cmdline(buf, size, pid, comm) snprintf(buf, size, "[%s]", comm)
+#endif
 pid_t *find_pid_by_name(const char* procName) FAST_FUNC;
 pid_t *pidlist_reverse(pid_t *pidList) FAST_FUNC;
 int starts_with_cpu(const char *str) FAST_FUNC;
@@ -1842,7 +1868,11 @@ extern const char bb_path_wtmp_file[] ALIGN1;
 #define bb_path_motd_file "/etc/motd"
 
 #define bb_dev_null "/dev/null"
+#if ENABLE_PLATFORM_MINGW32
+#define bb_busybox_exec_path get_busybox_exec_path()
+#else
 extern const char bb_busybox_exec_path[] ALIGN1;
+#endif
 /* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin,
  * but I want to save a few bytes here */
 extern const char bb_PATH_root_path[] ALIGN1; /* "PATH=/sbin:/usr/sbin:/bin:/usr/bin" */
diff --git a/include/mingw.h b/include/mingw.h
new file mode 100644
index 000000000..569c2c704
--- /dev/null
+++ b/include/mingw.h
@@ -0,0 +1,482 @@
+
+#define NOIMPL(name,...) static inline int name(__VA_ARGS__) { errno = ENOSYS; return -1; }
+#define IMPL(name,ret,retval,...) static inline ret name(__VA_ARGS__) { return retval; }
+
+/*
+ * sys/types.h
+ */
+typedef int gid_t;
+typedef int uid_t;
+#ifndef _WIN64
+typedef int pid_t;
+#else
+typedef __int64 pid_t;
+#endif
+
+#define DEFAULT_UID 1000
+#define DEFAULT_GID 1000
+
+/*
+ * arpa/inet.h
+ */
+static inline unsigned int git_ntohl(unsigned int x) { return (unsigned int)ntohl(x); }
+#define ntohl git_ntohl
+int inet_aton(const char *cp, struct in_addr *inp);
+int inet_pton(int af, const char *src, void *dst);
+
+/*
+ * fcntl.h
+ */
+#define F_DUPFD 0
+#define F_GETFD 1
+#define F_SETFD 2
+#define F_GETFL 3
+#define F_SETFL 3
+#define FD_CLOEXEC 0x1
+#define O_NONBLOCK 04000
+
+/*
+ * grp.h
+ */
+
+struct group {
+        char *gr_name;
+        char *gr_passwd;
+        gid_t gr_gid;
+        char **gr_mem;
+};
+IMPL(getgrnam,struct group *,NULL,const char *name UNUSED_PARAM);
+struct group *getgrgid(gid_t gid);
+NOIMPL(initgroups,const char *group UNUSED_PARAM,gid_t gid UNUSED_PARAM);
+static inline void endgrent(void) {}
+int getgrouplist(const char *user, gid_t group, gid_t *groups, int *ngroups);
+
+/*
+ * limits.h
+ */
+#define NAME_MAX 255
+#define MAXSYMLINKS 20
+
+/*
+ * netdb.h
+ */
+
+typedef int sa_family_t;
+
+/*
+ * linux/un.h
+ */
+struct sockaddr_un {
+        sa_family_t sun_family;
+        char sun_path[1]; /* to make compiler happy, don't bother */
+};
+
+/*
+ * pwd.h
+ */
+struct passwd {
+        char *pw_name;
+        char *pw_passwd;
+        char *pw_gecos;
+        char *pw_dir;
+        char *pw_shell;
+        uid_t pw_uid;
+        gid_t pw_gid;
+};
+
+struct passwd *getpwnam(const char *name);
+struct passwd *getpwuid(uid_t uid);
+static inline void setpwent(void) {}
+static inline void endpwent(void) {}
+IMPL(getpwent_r,int,ENOENT,struct passwd *pwbuf UNUSED_PARAM,char *buf UNUSED_PARAM,size_t buflen UNUSED_PARAM,struct passwd **pwbufp UNUSED_PARAM);
+IMPL(getpwent,struct passwd *,NULL,void)
+
+/*
+ * signal.h
+ */
+#define SIGHUP 1
+#define SIGQUIT 3
+#define SIGKILL 9
+#define SIGUSR1 10
+#define SIGUSR2 12
+#define SIGPIPE 13
+#define SIGALRM 14
+#define SIGCHLD 17
+#define SIGCONT 18
+#define SIGSTOP 19
+#define SIGTSTP 20
+#define SIGTTIN 21
+#define SIGTTOU 22
+#define SIGXCPU 24
+#define SIGXFSZ 25
+#define SIGVTALRM 26
+#define SIGWINCH 28
+
+#define SIG_UNBLOCK 1
+
+typedef void (__cdecl *sighandler_t)(int);
+struct sigaction {
+        sighandler_t sa_handler;
+        unsigned sa_flags;
+        int sa_mask;
+};
+#define sigemptyset(x) (void)0
+#define SA_RESTART 0
+
+NOIMPL(sigaction,int sig UNUSED_PARAM, struct sigaction *in UNUSED_PARAM, struct sigaction *out UNUSED_PARAM);
+NOIMPL(sigfillset,int *mask UNUSED_PARAM);
+NOIMPL(FAST_FUNC sigprocmask_allsigs, int how UNUSED_PARAM);
+NOIMPL(FAST_FUNC sigaction_set,int signo UNUSED_PARAM, const struct sigaction *sa UNUSED_PARAM);
+
+/*
+ * stdio.h
+ */
+#undef fseeko
+#define fseeko(f,o,w) fseek(f,o,w)
+
+int fdprintf(int fd, const char *format, ...);
+FILE* mingw_fopen(const char *filename, const char *mode);
+int mingw_rename(const char*, const char*);
+#define fopen mingw_fopen
+#define rename mingw_rename
+
+FILE *mingw_popen(const char *cmd, const char *mode);
+int mingw_popen_fd(const char *cmd, const char *mode, int fd0, pid_t *pid);
+int mingw_pclose(FILE *fd);
+#undef popen
+#undef pclose
+#define popen mingw_popen
+#define pclose mingw_pclose
+
+#define setlinebuf(fd) setvbuf(fd, (char *) NULL, _IOLBF, 0)
+
+/*
+ * ANSI emulation wrappers
+ */
+
+void move_cursor_row(int n);
+void reset_screen(void);
+int winansi_putchar(int c);
+int winansi_puts(const char *s);
+size_t winansi_fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream);
+int winansi_fputs(const char *str, FILE *stream);
+int winansi_vfprintf(FILE *stream, const char *format, va_list list);
+int winansi_printf(const char *format, ...) __attribute__((format (printf, 1, 2)));
+int winansi_fprintf(FILE *stream, const char *format, ...) __attribute__((format (printf, 2, 3)));
+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);
+#define putchar winansi_putchar
+#define puts winansi_puts
+#define fwrite winansi_fwrite
+#define fputs winansi_fputs
+#define vprintf(...) winansi_vfprintf(stdout, __VA_ARGS__)
+#define printf(...) winansi_printf(__VA_ARGS__)
+#define fprintf(...) winansi_fprintf(__VA_ARGS__)
+#define write winansi_write
+#define read winansi_read
+#define getc winansi_getc
+
+int winansi_get_terminal_width_height(struct winsize *win);
+
+/*
+ * stdlib.h
+ */
+#define WIFEXITED(x) ((unsigned)(x) < 259)      /* STILL_ACTIVE */
+#define WEXITSTATUS(x) ((x) & 0xff)
+#define WIFSIGNALED(x) ((unsigned)(x) > 259)
+#define WTERMSIG(x) ((x) & 0x7f)
+#define WCOREDUMP(x) 0
+
+int mingw_system(const char *cmd);
+#define system mingw_system
+
+int clearenv(void);
+char *mingw_getenv(const char *name);
+int mingw_putenv(const char *env);
+char *mingw_mktemp(char *template);
+int mkstemp(char *template);
+char *realpath(const char *path, char *resolved_path);
+int setenv(const char *name, const char *value, int replace);
+#if ENABLE_SAFE_ENV
+int unsetenv(const char *env);
+#else
+void unsetenv(const char *env);
+#endif
+
+#define getenv mingw_getenv
+#if ENABLE_SAFE_ENV
+#define putenv mingw_putenv
+#endif
+#define mktemp mingw_mktemp
+
+/*
+ * string.h
+ */
+void *mempcpy(void *dest, const void *src, size_t n);
+
+/*
+ * strings.h
+ */
+int ffs(int i);
+
+/*
+ * sys/ioctl.h
+ */
+
+#define TIOCGWINSZ 0x5413
+
+int ioctl(int fd, int code, ...);
+
+/*
+ * sys/socket.h
+ */
+#define hstrerror strerror
+
+#define SHUT_WR SD_SEND
+
+int mingw_socket(int domain, int type, int protocol);
+int mingw_connect(int sockfd, const struct sockaddr *sa, size_t sz);
+int mingw_bind(int sockfd, struct sockaddr *sa, size_t sz);
+int mingw_setsockopt(int sockfd, int lvl, int optname, void *optval, int optlen);
+int mingw_shutdown(int sockfd, int how);
+int mingw_listen(int sockfd, int backlog);
+int mingw_accept(int sockfd1, struct sockaddr *sa, socklen_t *sz);
+int mingw_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *xfds,
+            struct timeval *timeout);
+
+NOIMPL(mingw_sendto,SOCKET s UNUSED_PARAM, const char *buf UNUSED_PARAM, int len UNUSED_PARAM, int flags UNUSED_PARAM, const struct sockaddr *sa UNUSED_PARAM, int salen UNUSED_PARAM);
+
+#define socket mingw_socket
+#define connect mingw_connect
+#define sendto mingw_sendto
+#define listen mingw_listen
+#define bind mingw_bind
+#define setsockopt mingw_setsockopt
+#define shutdown mingw_shutdown
+#define accept mingw_accept
+#define select mingw_select
+
+/*
+ * sys/stat.h
+ */
+#define S_ISUID 04000
+#define S_ISGID 02000
+#define S_ISVTX 01000
+#ifndef S_IRWXU
+#define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR)
+#endif
+#define S_IRWXG (S_IRWXU >> 3)
+#define S_IRWXO (S_IRWXG >> 3)
+
+#define S_IFSOCK 0140000
+#define S_IFLNK    0120000 /* Symbolic link */
+#define S_ISLNK(x) (((x) & S_IFMT) == S_IFLNK)
+#define S_ISSOCK(x) 0
+
+#define S_IRGRP (S_IRUSR >> 3)
+#define S_IWGRP (S_IWUSR >> 3)
+#define S_IXGRP (S_IXUSR >> 3)
+#define S_IROTH (S_IRGRP >> 3)
+#define S_IWOTH (S_IWGRP >> 3)
+#define S_IXOTH (S_IXGRP >> 3)
+
+IMPL(fchmod,int,0,int fildes UNUSED_PARAM, mode_t mode UNUSED_PARAM);
+NOIMPL(fchown,int fd UNUSED_PARAM, uid_t uid UNUSED_PARAM, gid_t gid UNUSED_PARAM);
+int mingw_mkdir(const char *path, int mode);
+int mingw_chmod(const char *path, int mode);
+
+#define mkdir mingw_mkdir
+#define chmod mingw_chmod
+
+#if ENABLE_LFS && !defined(__MINGW64_VERSION_MAJOR)
+# define off_t off64_t
+#endif
+
+typedef int nlink_t;
+typedef int blksize_t;
+typedef off_t blkcnt_t;
+
+struct mingw_stat {
+        dev_t     st_dev;
+        ino_t     st_ino;
+        mode_t    st_mode;
+        nlink_t   st_nlink;
+        uid_t     st_uid;
+        gid_t     st_gid;
+        dev_t     st_rdev;
+        off_t     st_size;
+        time_t    st_atime;
+        time_t    st_mtime;
+        time_t    st_ctime;
+        blksize_t st_blksize;
+        blkcnt_t  st_blocks;
+};
+
+int mingw_lstat(const char *file_name, struct mingw_stat *buf);
+int mingw_stat(const char *file_name, struct mingw_stat *buf);
+int mingw_fstat(int fd, struct mingw_stat *buf);
+#undef lstat
+#undef stat
+#undef fstat
+#define lstat mingw_lstat
+#define stat mingw_stat
+#define fstat mingw_fstat
+
+/*
+ * sys/sysmacros.h
+ */
+#define makedev(a,b) 0*(a)*(b) /* avoid unused warning */
+#define minor(x) 0
+#define major(x) 0
+
+/*
+ * sys/time.h
+ */
+#ifndef _TIMESPEC_DEFINED
+#define _TIMESPEC_DEFINED
+struct timespec {
+        time_t tv_sec;
+        long int tv_nsec;
+};
+#endif
+
+/*
+ * sys/wait.h
+ */
+#define WNOHANG 1
+#define WUNTRACED 2
+int waitpid(pid_t pid, int *status, int options);
+
+/*
+ * time.h
+ */
+struct tm *gmtime_r(const time_t *timep, struct tm *result);
+struct tm *localtime_r(const time_t *timep, struct tm *result);
+char *strptime(const char *s, const char *format, struct tm *tm);
+size_t mingw_strftime(char *buf, size_t max, const char *format, const struct tm *tm);
+int stime(time_t *t);
+
+#define strftime mingw_strftime
+
+/*
+ * times.h
+ */
+#define clock_t long
+
+struct tms {
+        clock_t tms_utime;              /* user CPU time */
+        clock_t tms_stime;              /* system CPU time */
+        clock_t tms_cutime;             /* user CPU time of children */
+        clock_t tms_cstime;             /* system CPU time of children */
+};
+
+clock_t times(struct tms *buf);
+
+/*
+ * unistd.h
+ */
+#define PIPE_BUF 8192
+
+#define _SC_CLK_TCK 2
+
+IMPL(alarm,unsigned int,0,unsigned int seconds UNUSED_PARAM);
+IMPL(chown,int,0,const char *path UNUSED_PARAM, uid_t uid UNUSED_PARAM, gid_t gid UNUSED_PARAM);
+NOIMPL(chroot,const char *root UNUSED_PARAM);
+NOIMPL(fchdir,int fd UNUSED_PARAM);
+int mingw_dup2 (int fd, int fdto);
+char *mingw_getcwd(char *pointer, int len);
+off_t mingw_lseek(int fd, off_t offset, int whence);
+
+
+IMPL(getgid,int,DEFAULT_GID,void);
+int getgroups(int n, gid_t *groups);
+IMPL(getppid,int,1,void);
+IMPL(getegid,int,DEFAULT_GID,void);
+IMPL(geteuid,int,DEFAULT_UID,void);
+NOIMPL(getsid,pid_t pid UNUSED_PARAM);
+IMPL(getuid,int,DEFAULT_UID,void);
+int getlogin_r(char *buf, size_t len);
+int fcntl(int fd, int cmd, ...);
+#define fork() -1
+IMPL(fsync,int,0,int fd UNUSED_PARAM);
+int kill(pid_t pid, int sig);
+int link(const char *oldpath, const char *newpath);
+NOIMPL(mknod,const char *name UNUSED_PARAM, mode_t mode UNUSED_PARAM, dev_t device UNUSED_PARAM);
+int mingw_open (const char *filename, int oflags, ...);
+int pipe(int filedes[2]);
+NOIMPL(readlink,const char *path UNUSED_PARAM, char *buf UNUSED_PARAM, size_t bufsiz UNUSED_PARAM);
+NOIMPL(setgid,gid_t gid UNUSED_PARAM);
+NOIMPL(setegid,gid_t gid UNUSED_PARAM);
+NOIMPL(setsid,void);
+NOIMPL(setuid,uid_t gid UNUSED_PARAM);
+NOIMPL(seteuid,uid_t gid UNUSED_PARAM);
+unsigned int sleep(unsigned int seconds);
+NOIMPL(symlink,const char *oldpath UNUSED_PARAM, const char *newpath UNUSED_PARAM);
+static inline void sync(void) {}
+long sysconf(int name);
+NOIMPL(ttyname_r,int fd UNUSED_PARAM, char *buf UNUSED_PARAM, int sz UNUSED_PARAM);
+int mingw_unlink(const char *pathname);
+NOIMPL(vfork,void);
+int mingw_access(const char *name, int mode);
+int mingw_rmdir(const char *name);
+
+#define dup2 mingw_dup2
+#define getcwd mingw_getcwd
+#define lchown chown
+#define open mingw_open
+#define unlink mingw_unlink
+#define rmdir mingw_rmdir
+#undef lseek
+#define lseek mingw_lseek
+
+#undef access
+#define access mingw_access
+
+/*
+ * utime.h
+ */
+int utimes(const char *file_name, const struct timeval times[2]);
+
+/*
+ * dirent.h
+ */
+DIR *mingw_opendir(const char *path);
+#define opendir mingw_opendir
+
+/*
+ * MinGW specific
+ */
+#define is_dir_sep(c) ((c) == '/' || (c) == '\\')
+#ifndef PRIuMAX
+#define PRIuMAX "I64u"
+#endif
+
+pid_t FAST_FUNC mingw_spawn(char **argv);
+intptr_t FAST_FUNC mingw_spawn_proc(char **argv);
+int mingw_execv(const char *cmd, const char *const *argv);
+int mingw_execvp(const char *cmd, const char *const *argv);
+int mingw_execve(const char *cmd, const char *const *argv, const char *const *envp);
+#define spawn mingw_spawn
+#define execvp mingw_execvp
+#define execve mingw_execve
+#define execv mingw_execv
+
+const char * next_path_sep(const char *path);
+#define has_dos_drive_prefix(path) (isalpha(*(path)) && (path)[1] == ':')
+#define is_absolute_path(path) ((path)[0] == '/' || (path)[0] == '\\' || has_dos_drive_prefix(path))
+
+/*
+ * helpers
+ */
+
+char **copy_environ(const char *const *env);
+void free_environ(char **env);
+char **env_setenv(char **env, const char *name);
+
+const char *get_busybox_exec_path(void);
+void init_winsock(void);
+
+char *file_is_win32_executable(const char *p);
+
+int err_win_to_posix(DWORD winerr);
diff --git a/include/platform.h b/include/platform.h
index c987d418c..94368539e 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -7,6 +7,15 @@
 #ifndef BB_PLATFORM_H
 #define BB_PLATFORM_H 1
 
+#if ENABLE_PLATFORM_MINGW32
+# if !defined(__MINGW32__) /* HOSTCC is called */
+#  undef ENABLE_PLATFORM_MINGW32
+# endif
+#else
+# if defined(__MINGW32__)
+#  error "You must select target platform MS Windows, or it won't build"
+# endif
+#endif
 
 /* Convenience macros to test the version of gcc. */
 #undef __GNUC_PREREQ
@@ -119,7 +128,7 @@
 
 /* Make all declarations hidden (-fvisibility flag only affects definitions) */
 /* (don't include system headers after this until corresponding pop!) */
-#if __GNUC_PREREQ(4,1) && !defined(__CYGWIN__)
+#if __GNUC_PREREQ(4,1) && !defined(__CYGWIN__) && !ENABLE_PLATFORM_MINGW32
 # define PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN _Pragma("GCC visibility push(hidden)")
 # define POP_SAVED_FUNCTION_VISIBILITY              _Pragma("GCC visibility pop")
 #else
@@ -148,6 +157,14 @@
 # define bswap_64 __bswap64
 # define bswap_32 __bswap32
 # define bswap_16 __bswap16
+# define __BIG_ENDIAN__ (_BYTE_ORDER == _BIG_ENDIAN)
+#elif ENABLE_PLATFORM_MINGW32
+# define __BIG_ENDIAN 0
+# define __LITTLE_ENDIAN 1
+# define __BYTE_ORDER __LITTLE_ENDIAN
+# define bswap_16(x) ((((x) & 0xFF00) >> 8) | (((x) & 0xFF) << 8))
+# define bswap_32(x) ((bswap_16(((x) & 0xFFFF0000L) >> 16)) | (bswap_16((x) & 0xFFFFL) << 16))
+# define bswap_64(x) ((bswap_32(((x) & 0xFFFFFFFF00000000LL) >> 32)) | (bswap_32((x) & 0xFFFFFFFFLL) << 32))
 #else
 # include <byteswap.h>
 # include <endian.h>
@@ -400,6 +417,25 @@ typedef unsigned smalluint;
 # endif
 #endif
 
+#if ENABLE_PLATFORM_MINGW32
+# undef HAVE_DPRINTF
+# undef HAVE_GETLINE
+# undef HAVE_MEMRCHR
+# undef HAVE_MKDTEMP
+# undef HAVE_SETBIT
+# undef HAVE_STPCPY
+# undef HAVE_STRCASESTR
+# undef HAVE_STRCHRNUL
+# undef HAVE_STRSEP
+# undef HAVE_STRSIGNAL
+# undef HAVE_STRVERSCMP
+#if !defined(__MINGW64_VERSION_MAJOR)
+# undef HAVE_VASPRINTF
+#endif
+# undef HAVE_UNLOCKED_STDIO
+# undef HAVE_UNLOCKED_LINE_OPS
+#endif
+
 #if defined(__WATCOMC__)
 # undef HAVE_DPRINTF
 # undef HAVE_GETLINE
@@ -511,6 +547,7 @@ extern int dprintf(int fd, const char *format, ...);
 #endif
 
 #ifndef HAVE_MEMRCHR
+#include <stddef.h>
 extern void *memrchr(const void *s, int c, size_t n) FAST_FUNC;
 #endif
 
@@ -570,6 +607,7 @@ extern int usleep(unsigned) FAST_FUNC;
 #endif
 
 #ifndef HAVE_VASPRINTF
+# include <stdarg.h>
 extern int vasprintf(char **string_ptr, const char *format, va_list p) FAST_FUNC;
 #endif