Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-23 05:09:43 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

More fixes for mingw32

Browse Source
This commit is contained in:
pancake 2014-09-01 15:25:32 +02:00
parent 80244ae931
commit 734d22f214
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure-plugins
View File

@ -123,8 +123,17 @@ sub () {
n="" ; for a in $1 ; do [ $a = $2 ] && continue ; n="$n $a" ; done ; echo $n
}
echo | sort -t. > /dev/null 2>&1
if [ $? = 0 ]; then
SORT="sort -t."
else
SORT="sort"
fi
dosort () {
( for a in $1 ; do echo $a ; done ) | sort -t.
( for a in $1 ; do echo $a ; done ) | ${SORT}
#( for a in $1 ; do echo $a ; done ) | sort -t. --key=1,1d
}
@ -166,6 +175,9 @@ sort_vars
[ ${DONOTHING} = 0 ] && generate
echo ${SHARED}
echo ${STATIC}
save
exit 0

10
libr/include/sdb/types.h
View File

@ -16,10 +16,14 @@
#define SDB_API
#endif
#if MINGW || __MINGW32__ || __MINGW64__
#define __MINGW__ 1
#endif
#if __CYGWIN__
#define ULLFMT "ll"
#define USE_MMAN 1
#elif __WIN32__ || MINGW32
#elif __WIN32__ || __MINGW__
#define ULLFMT "I64"
#define USE_MMAN 0
#else
@ -27,7 +31,7 @@
#define USE_MMAN 1
#endif
#if __WIN32__ || __CYGWIN__ || MINGW32 || __MINGW32__ || __MINGW64__
#if __WIN32__ || __CYGWIN__ || __MINGW__
#undef __WINDOWS__
#define __WINDOWS__ 1
#include <windows.h>
@ -44,7 +48,7 @@
#endif
#endif
#if __WIN32__ || __CYGWIN__ || MINGW32
#if __WIN32__ || __CYGWIN__ || __MINGW32__
#define WINDOWS 1
#else
#define WINDOWS 0

10
shlr/sdb/src/types.h
View File

@ -16,10 +16,14 @@
#define SDB_API
#endif
#if MINGW || __MINGW32__ || __MINGW64__
#define __MINGW__ 1
#endif
#if __CYGWIN__
#define ULLFMT "ll"
#define USE_MMAN 1
#elif __WIN32__ || MINGW32
#elif __WIN32__ || __MINGW__
#define ULLFMT "I64"
#define USE_MMAN 0
#else
@ -27,7 +31,7 @@
#define USE_MMAN 1
#endif
#if __WIN32__ || __CYGWIN__ || MINGW32 || __MINGW32__ || __MINGW64__
#if __WIN32__ || __CYGWIN__ || __MINGW__
#undef __WINDOWS__
#define __WINDOWS__ 1
#include <windows.h>
@ -44,7 +48,7 @@
#endif
#endif
#if __WIN32__ || __CYGWIN__ || MINGW32
#if __WIN32__ || __CYGWIN__ || __MINGW32__
#define WINDOWS 1
#else
#define WINDOWS 0