Remove the --enable-iphone option as needless.

On or-talk, Marco Bonetti reports that recent iPhone SDKs build
Tor fine without it.

diff --git a/ChangeLog b/ChangeLog
index 07db64edc10b1e04fdcdc54f035bc2b13c005ba1..f762c39beb5854ef409f1881e59092c1a7a15ddc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 6497623fe3dfb0ee77e09c330c1cb403d849bbb9..ff402400311bd850cf4e5e6c34314cb8c9eff0ac 100644 (file)
--- 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 7295bf25bd4a157caf5709ba62b7d0d57713719c..406d74eb25436692f4233bca673f1365a7fdbf92 100644 (file)
--- 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;