diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | src/common/compat.c | 3 |
3 files changed, 3 insertions, 12 deletions
@@ -25,6 +25,9 @@ Changes in version 0.2.2.9-alpha - 2010-??-?? - Generate our manpage and HTML documentation using Asciidoc. This should make it easier to maintain the documentation, and produce nicer HTML. + - Remove the --enable-iphone option. According to reports from + Marco Bonetti, Tor builds fine without any special tweaking on + recent iPhone SDK versions. o Removed features: - Stop shipping parts of the website and the design paper in the diff --git a/configure.in b/configure.in index 6497623fe3..ff40240031 100644 --- a/configure.in +++ b/configure.in @@ -19,15 +19,6 @@ fi # the += operator on it in src/or/Makefile.am CPPFLAGS="$CPPFLAGS -I\${top_srcdir}/src/common" -#XXXX ideally, we should make this into a no-op, and detect whether we're -#compiling for the iphone by using $target. -AC_ARG_ENABLE(iphone, - AS_HELP_STRING(--enable-iphone, compile with iPhone support), - [if test x$enableval = xyes ; then - tor_cv_iphone=true - CFLAGS="$CFLAGS -D__DARWIN_UNIX03 -DIPHONE" - fi]) - #XXXX020 We should make these enabled or not, before 0.2.0.x-final AC_ARG_ENABLE(buf-freelists, AS_HELP_STRING(--disable-buf-freelists, disable freelists for buffer RAM)) diff --git a/src/common/compat.c b/src/common/compat.c index 7295bf25bd..406d74eb25 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1009,9 +1009,6 @@ set_max_file_descriptors(rlim_t limit, int *max_out) #if defined(CYGWIN) || defined(__CYGWIN__) const char *platform = "Cygwin"; const unsigned long MAX_CONNECTIONS = 3200; -#elif defined(IPHONE) - const char *platform = "iPhone"; - const unsigned long MAX_CONNECTIONS = 9999; #elif defined(MS_WINDOWS) const char *platform = "Windows"; const unsigned long MAX_CONNECTIONS = 15000; |