diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-12-23 18:27:47 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-12-23 18:27:47 +0000 |
| commit | 473725e1a47c65b59dc22d974c0d7dd2d7f7c44c (patch) | |
| tree | d87a0111be162564e575f9c64d02b0795920959b | |
| parent | 4606a8af03983b6a08e9fc05d49c710922242f3e (diff) | |
| download | tor-473725e1a47c65b59dc22d974c0d7dd2d7f7c44c.tar.gz tor-473725e1a47c65b59dc22d974c0d7dd2d7f7c44c.zip | |
r15648@tombo: nickm | 2007-12-23 13:27:30 -0500
Support building for iPhone; patch from cjacker huang.
svn:r12946
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | src/or/or.h | 6 |
3 files changed, 18 insertions, 2 deletions
@@ -2,6 +2,11 @@ Changes in version 0.2.0.15-alpha - 2008-01-?? o Minor bugfixes: - Fix configure.in logic for cross-compilation. + o Minor features: + - Support compilation to target iPhone; patch from cjacker huang. + To build for iPhone, pass the --enable-iphone option to configure. + + Changes in version 0.2.0.14-alpha - 2007-12-23 o Major bugfixes: - Fix a crash on startup if you install Tor 0.2.0.13-alpha fresh diff --git a/configure.in b/configure.in index 3645d77d14..8e3765c81c 100644 --- a/configure.in +++ b/configure.in @@ -25,6 +25,15 @@ AC_ARG_ENABLE(debug, CFLAGS="$CFLAGS -g" fi]) +#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_UINX03 -DIPHONE" + fi]) + AC_ARG_ENABLE(cell-pool, AS_HELP_STRING(--disable-cell-pool, disable pool allocator for cells)) diff --git a/src/or/or.h b/src/or/or.h index 8be6717a64..5e2610994e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -67,8 +67,10 @@ /** Upper bound on maximum simultaneous connections; can be lowered by * config file. */ -#if defined(CYGWIN) || defined(__CYGWIN__) -/* http://archives.seul.org/or/talk/Aug-2006/msg00210.html */ +#if defined(CYGWIN) || defined(__CYGWIN__) || defined(IPHONE) +/* Re Cygwin, see http://archives.seul.org/or/talk/Aug-2006/msg00210.html */ +/* For an iPhone, the limit would be closer to 9999. But nobody seems to be + * running a server on an iPhone anyway? */ #define MAXCONNECTIONS 3200 #else /* very high by default. "nobody should need more than this..." */ |