Просмотр исходного кода

Remove the --enable-iphone option as needless.

On or-talk, Marco Bonetti reports that recent iPhone SDKs build
Tor fine without it.
Nick Mathewson 16 лет назад
Родитель
Сommit
79bdfb63e9
3 измененных файлов с 3 добавлено и 12 удалено
  1. 3 0
      ChangeLog
  2. 0 9
      configure.in
  3. 0 3
      src/common/compat.c

+ 3 - 0
ChangeLog

@@ -25,6 +25,9 @@ Changes in version 0.2.2.9-alpha - 2010-??-??
     - Generate our manpage and HTML documentation using Asciidoc.  This
     - Generate our manpage and HTML documentation using Asciidoc.  This
       should make it easier to maintain the documentation, and produce
       should make it easier to maintain the documentation, and produce
       nicer HTML.
       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:
   o Removed features:
     - Stop shipping parts of the website and the design paper in the
     - Stop shipping parts of the website and the design paper in the

+ 0 - 9
configure.in

@@ -19,15 +19,6 @@ fi
 # the += operator on it in src/or/Makefile.am
 # the += operator on it in src/or/Makefile.am
 CPPFLAGS="$CPPFLAGS -I\${top_srcdir}/src/common"
 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
 #XXXX020 We should make these enabled or not, before 0.2.0.x-final
 AC_ARG_ENABLE(buf-freelists,
 AC_ARG_ENABLE(buf-freelists,
    AS_HELP_STRING(--disable-buf-freelists, disable freelists for buffer RAM))
    AS_HELP_STRING(--disable-buf-freelists, disable freelists for buffer RAM))

+ 0 - 3
src/common/compat.c

@@ -1009,9 +1009,6 @@ set_max_file_descriptors(rlim_t limit, int *max_out)
 #if defined(CYGWIN) || defined(__CYGWIN__)
 #if defined(CYGWIN) || defined(__CYGWIN__)
   const char *platform = "Cygwin";
   const char *platform = "Cygwin";
   const unsigned long MAX_CONNECTIONS = 3200;
   const unsigned long MAX_CONNECTIONS = 3200;
-#elif defined(IPHONE)
-  const char *platform = "iPhone";
-  const unsigned long MAX_CONNECTIONS = 9999;
 #elif defined(MS_WINDOWS)
 #elif defined(MS_WINDOWS)
   const char *platform = "Windows";
   const char *platform = "Windows";
   const unsigned long MAX_CONNECTIONS = 15000;
   const unsigned long MAX_CONNECTIONS = 15000;