wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

remove residual geoip cruft

This commit is contained in:
Arvid Norberg 2015-05-11 00:49:34 +00:00
parent b418aeb466
commit 5e07ff857e
4 changed files with 1 additions and 1102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Jamfile
View File

@ -568,9 +568,6 @@ lib libnsl : : <name>nsl <link>shared <search>/usr/sfw/lib <link>shared ;
lib tcmalloc : : <name>tcmalloc <link>shared ; lib tcmalloc : : <name>tcmalloc <link>shared ;
# GeoIP shared library
lib GeoIP : : <name>GeoIP <link>shared ;
# socket libraries on windows # socket libraries on windows
lib wsock32 : : <name>wsock32 <link>shared ; lib wsock32 : : <name>wsock32 <link>shared ;
lib ws2_32 : : <name>ws2_32 <link>shared ; lib ws2_32 : : <name>ws2_32 <link>shared ;

19
configure.ac
View File

@ -153,25 +153,6 @@ AC_PROG_INSTALL
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
# check for gethostbyname and gethostbyname_r (used in src/GeoIP.c)
AC_CHECK_FUNCS([gethostbyname], [],
[AC_CHECK_LIB([nsl], [gethostbyname], [],
[AC_CHECK_LIB([resolv], [gethostbyname], [],
[AC_CHECK_LIB([socket], [gethostbyname], [],
[AC_CHECK_LIB([ws2_32], [main],
[AC_CHECK_LIB([wsock32], [main],
[LIBS="-lws2_32 -lwsock32 $LIBS"],
[AC_MSG_ERROR([wsock32 function not found.])])],
[AC_MSG_ERROR([gethostbyname function not found.])])])])])]
)
AC_CHECK_FUNCS(gethostbyname_r, [
# We look for the one that returns `int'.
# Hopefully this check is robust enough.
AC_EGREP_HEADER(int.*gethostbyname_r, netdb.h, [
AC_DEFINE(GETHOSTBYNAME_R_RETURNS_INT)])
])
AC_CHECK_FUNCS([clock_gettime], [], AC_CHECK_FUNCS([clock_gettime], [],
[AC_CHECK_LIB([rt], [clock_gettime], [], [AC_CHECK_LIB([rt], [clock_gettime], [],
[AC_CHECK_LIB([posix4], [clock_gettime], [], [AC_CHECK_LIB([posix4], [clock_gettime], [],

4
examples/client_test.cpp
View File

@ -179,7 +179,6 @@ bool show_dht_status = false;
bool sequential_download = false; bool sequential_download = false;
bool print_ip = true; bool print_ip = true;
bool print_as = false;
bool print_timers = false; bool print_timers = false;
bool print_block = false; bool print_block = false;
bool print_peer_rate = false; bool print_peer_rate = false;
@ -1910,7 +1909,6 @@ int main(int argc, char* argv[])
if (c == 'x') print_disk_stats = !print_disk_stats; if (c == 'x') print_disk_stats = !print_disk_stats;
// toggle columns // toggle columns
if (c == '1') print_ip = !print_ip; if (c == '1') print_ip = !print_ip;
if (c == '2') print_as = !print_as;
if (c == '3') print_timers = !print_timers; if (c == '3') print_timers = !print_timers;
if (c == '4') print_block = !print_block; if (c == '4') print_block = !print_block;
if (c == '5') print_peer_rate = !print_peer_rate; if (c == '5') print_peer_rate = !print_peer_rate;
@ -1944,7 +1942,7 @@ int main(int argc, char* argv[])
"[P] show pad files (in file list)\n" "[P] show pad files (in file list)\n"
"\n" "\n"
"COLUMN OPTIONS\n" "COLUMN OPTIONS\n"
"[1] toggle IP column [2] toggle AS column\n" "[1] toggle IP column [2]\n"
"[3] toggle timers column [4] toggle block progress column\n" "[3] toggle timers column [4] toggle block progress column\n"
"[5] toggle peer rate column [6] toggle failures column\n" "[5] toggle peer rate column [6] toggle failures column\n"
"[7] toggle send buffers column\n" "[7] toggle send buffers column\n"

1077
src/GeoIP.c
View File

File diff suppressed because it is too large Load Diff