aboutsummaryrefslogtreecommitdiff
path: root/include/mingw.h
diff options
context:
space:
mode:
authorTony Kelman <tony@kelman.net>2015-01-22 17:16:59 -0800
committerTony Kelman <tony@kelman.net>2015-01-22 17:16:59 -0800
commit06900749637b925af1ebdf5030ba03a379f4f84f (patch)
treedc95c2ad249c3cc6c86698e3159e63fc8dfc6e59 /include/mingw.h
parent8ec94b6f617dc1314221f0ebf6b01467c62950e3 (diff)
downloadbusybox-w32-06900749637b925af1ebdf5030ba03a379f4f84f.tar.gz
busybox-w32-06900749637b925af1ebdf5030ba03a379f4f84f.tar.bz2
busybox-w32-06900749637b925af1ebdf5030ba03a379f4f84f.zip
Fix error: conflicting types for ‘pid_t’ with mingw64
Using x86_64-w64-mingw32-gcc cross-compiler for win64 gives an error: ``` In file included from include/libbb.h:163:0, from include/busybox.h:8, from applets/applets.c:9: include/mingw.h:10:13: error: conflicting types for ‘pid_t’ typedef int pid_t; ^ In file included from /usr/share/mingw-w64/include/process.h:12:0, from /usr/share/mingw-w64/include/unistd.h:11, from include/platform.h:313, from include/libbb.h:13, from include/busybox.h:8, from applets/applets.c:9: /usr/share/mingw-w64/include/sys/types.h:68:16: note: previous declaration of ‘pid_t’ was here typedef _pid_t pid_t; ^ make[1]: *** [applets/applets.o] Error 1 ``` This change fixes it and results in a successful build of 64-bit busybox.exe.
Diffstat (limited to 'include/mingw.h')
-rw-r--r--include/mingw.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/mingw.h b/include/mingw.h
index 12c5ef71d..090dd1776 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -7,7 +7,11 @@
7 */ 7 */
8typedef int gid_t; 8typedef int gid_t;
9typedef int uid_t; 9typedef int uid_t;
10#ifndef _WIN64
10typedef int pid_t; 11typedef int pid_t;
12#else
13typedef __int64 pid_t;
14#endif
11 15
12/* 16/*
13 * arpa/inet.h 17 * arpa/inet.h