- tor-commits - lists.torproject.org

[tor/release-0.2.2] Fix zlib macro brokenness on osx with zlib 1.2.4 and higher.
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit c5a3664f27379f5f6cc9a2b92032d50ab34550f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 8 18:10:20 2010 -0400 Fix zlib macro brokenness on osx with zlib 1.2.4 and higher. From the code: zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory that nobody will care if the compile outputs a no-such-identifier warning. Sorry, but we like -Werror over here, so I guess we need to define these. I hope that zlib 1.2.6 doesn't break these too. Possible fix for bug 1526. --- changes/bug1526 | 3 +++ src/common/torgzip.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/changes/bug1526 b/changes/bug1526 new file mode 100644 index 0000000..bae7104 --- /dev/null +++ b/changes/bug1526 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Build correctly on OSX with zlib 1.2.4 and higher with all warnings + enabled. \ No newline at end of file diff --git a/src/common/torgzip.c b/src/common/torgzip.c index f5709aa..95d5797 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -13,20 +13,42 @@ #include <stdlib.h> #include <stdio.h> #include <assert.h> -#ifdef _MSC_VER -#include "..\..\contrib\zlib\zlib.h" -#else -#include <zlib.h> -#endif #include <string.h> #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif +#include "torint.h" #include "util.h" #include "log.h" #include "torgzip.h" +/* zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of + saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory + that nobody will care if the compile outputs a no-such-identifier warning. + + Sorry, but we like -Werror over here, so I guess we need to define these. + I hope that zlib 1.2.6 doesn't break these too. +*/ +#ifndef _LARGEFILE64_SOURCE +#define _LARGEFILE64_SOURCE 0 +#endif +#ifndef _LFS64_LARGEFILE +#define _LFS64_LARGEFILE 0 +#endif +#ifndef _FILE_OFFSET_BITS +#define _FILE_OFFSET_BITS 0 +#endif +#ifndef off64_t +#define off64_t int64_t +#endif + +#ifdef _MSC_VER +#include "..\..\contrib\zlib\zlib.h" +#else +#include <zlib.h> +#endif + /** Set to 1 if zlib is a version that supports gzip; set to 0 if it doesn't; * set to -1 if we haven't checked yet. */ static int gzip_is_supported = -1;

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit 9af3a3c419fdad85933cad800a995f19bda08d28 Merge: ac115f1 c5a3664 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Oct 26 07:47:42 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit 403264175d7371a3caaff52fb8723fc5fc1101b6 Merge: e76f626 9af3a3c Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Oct 26 07:49:41 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2

1 0

[tor/maint-0.2.2] Fix zlib macro brokenness on osx with zlib 1.2.4 and higher.
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit c5a3664f27379f5f6cc9a2b92032d50ab34550f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 8 18:10:20 2010 -0400 Fix zlib macro brokenness on osx with zlib 1.2.4 and higher. From the code: zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory that nobody will care if the compile outputs a no-such-identifier warning. Sorry, but we like -Werror over here, so I guess we need to define these. I hope that zlib 1.2.6 doesn't break these too. Possible fix for bug 1526. --- changes/bug1526 | 3 +++ src/common/torgzip.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/changes/bug1526 b/changes/bug1526 new file mode 100644 index 0000000..bae7104 --- /dev/null +++ b/changes/bug1526 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Build correctly on OSX with zlib 1.2.4 and higher with all warnings + enabled. \ No newline at end of file diff --git a/src/common/torgzip.c b/src/common/torgzip.c index f5709aa..95d5797 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -13,20 +13,42 @@ #include <stdlib.h> #include <stdio.h> #include <assert.h> -#ifdef _MSC_VER -#include "..\..\contrib\zlib\zlib.h" -#else -#include <zlib.h> -#endif #include <string.h> #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif +#include "torint.h" #include "util.h" #include "log.h" #include "torgzip.h" +/* zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of + saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory + that nobody will care if the compile outputs a no-such-identifier warning. + + Sorry, but we like -Werror over here, so I guess we need to define these. + I hope that zlib 1.2.6 doesn't break these too. +*/ +#ifndef _LARGEFILE64_SOURCE +#define _LARGEFILE64_SOURCE 0 +#endif +#ifndef _LFS64_LARGEFILE +#define _LFS64_LARGEFILE 0 +#endif +#ifndef _FILE_OFFSET_BITS +#define _FILE_OFFSET_BITS 0 +#endif +#ifndef off64_t +#define off64_t int64_t +#endif + +#ifdef _MSC_VER +#include "..\..\contrib\zlib\zlib.h" +#else +#include <zlib.h> +#endif + /** Set to 1 if zlib is a version that supports gzip; set to 0 if it doesn't; * set to -1 if we haven't checked yet. */ static int gzip_is_supported = -1;

1 0

[tor/maint-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit 9af3a3c419fdad85933cad800a995f19bda08d28 Merge: ac115f1 c5a3664 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Oct 26 07:47:42 2011 -0400 Merge branch 'maint-0.2.1' into maint-0.2.2

1 0

[tor/release-0.2.1] Fix zlib macro brokenness on osx with zlib 1.2.4 and higher.
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit c5a3664f27379f5f6cc9a2b92032d50ab34550f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 8 18:10:20 2010 -0400 Fix zlib macro brokenness on osx with zlib 1.2.4 and higher. From the code: zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory that nobody will care if the compile outputs a no-such-identifier warning. Sorry, but we like -Werror over here, so I guess we need to define these. I hope that zlib 1.2.6 doesn't break these too. Possible fix for bug 1526. --- changes/bug1526 | 3 +++ src/common/torgzip.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/changes/bug1526 b/changes/bug1526 new file mode 100644 index 0000000..bae7104 --- /dev/null +++ b/changes/bug1526 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Build correctly on OSX with zlib 1.2.4 and higher with all warnings + enabled. \ No newline at end of file diff --git a/src/common/torgzip.c b/src/common/torgzip.c index f5709aa..95d5797 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -13,20 +13,42 @@ #include <stdlib.h> #include <stdio.h> #include <assert.h> -#ifdef _MSC_VER -#include "..\..\contrib\zlib\zlib.h" -#else -#include <zlib.h> -#endif #include <string.h> #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif +#include "torint.h" #include "util.h" #include "log.h" #include "torgzip.h" +/* zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of + saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory + that nobody will care if the compile outputs a no-such-identifier warning. + + Sorry, but we like -Werror over here, so I guess we need to define these. + I hope that zlib 1.2.6 doesn't break these too. +*/ +#ifndef _LARGEFILE64_SOURCE +#define _LARGEFILE64_SOURCE 0 +#endif +#ifndef _LFS64_LARGEFILE +#define _LFS64_LARGEFILE 0 +#endif +#ifndef _FILE_OFFSET_BITS +#define _FILE_OFFSET_BITS 0 +#endif +#ifndef off64_t +#define off64_t int64_t +#endif + +#ifdef _MSC_VER +#include "..\..\contrib\zlib\zlib.h" +#else +#include <zlib.h> +#endif + /** Set to 1 if zlib is a version that supports gzip; set to 0 if it doesn't; * set to -1 if we haven't checked yet. */ static int gzip_is_supported = -1;

1 0

[tor/release-0.2.1] Merge branch 'maint-0.2.1' into release-0.2.1
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit 7c29b6996ee315cf2d8fdd6fe53b47512174be77 Merge: c55f586 c5a3664 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Oct 26 07:39:01 2011 -0400 Merge branch 'maint-0.2.1' into release-0.2.1 changes/bug1526 | 3 +++ src/common/torgzip.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.2.1] Fix zlib macro brokenness on osx with zlib 1.2.4 and higher.
by arma＠torproject.org 26 Oct '11

26 Oct '11

commit c5a3664f27379f5f6cc9a2b92032d50ab34550f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 8 18:10:20 2010 -0400 Fix zlib macro brokenness on osx with zlib 1.2.4 and higher. From the code: zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory that nobody will care if the compile outputs a no-such-identifier warning. Sorry, but we like -Werror over here, so I guess we need to define these. I hope that zlib 1.2.6 doesn't break these too. Possible fix for bug 1526. --- changes/bug1526 | 3 +++ src/common/torgzip.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/changes/bug1526 b/changes/bug1526 new file mode 100644 index 0000000..bae7104 --- /dev/null +++ b/changes/bug1526 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Build correctly on OSX with zlib 1.2.4 and higher with all warnings + enabled. \ No newline at end of file diff --git a/src/common/torgzip.c b/src/common/torgzip.c index f5709aa..95d5797 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -13,20 +13,42 @@ #include <stdlib.h> #include <stdio.h> #include <assert.h> -#ifdef _MSC_VER -#include "..\..\contrib\zlib\zlib.h" -#else -#include <zlib.h> -#endif #include <string.h> #ifdef HAVE_NETINET_IN_H #include <netinet/in.h> #endif +#include "torint.h" #include "util.h" #include "log.h" #include "torgzip.h" +/* zlib 1.2.4 and 1.2.5 do some "clever" things with macros. Instead of + saying "(defined(FOO) ? FOO : 0)" they like to say "FOO-0", on the theory + that nobody will care if the compile outputs a no-such-identifier warning. + + Sorry, but we like -Werror over here, so I guess we need to define these. + I hope that zlib 1.2.6 doesn't break these too. +*/ +#ifndef _LARGEFILE64_SOURCE +#define _LARGEFILE64_SOURCE 0 +#endif +#ifndef _LFS64_LARGEFILE +#define _LFS64_LARGEFILE 0 +#endif +#ifndef _FILE_OFFSET_BITS +#define _FILE_OFFSET_BITS 0 +#endif +#ifndef off64_t +#define off64_t int64_t +#endif + +#ifdef _MSC_VER +#include "..\..\contrib\zlib\zlib.h" +#else +#include <zlib.h> +#endif + /** Set to 1 if zlib is a version that supports gzip; set to 0 if it doesn't; * set to -1 if we haven't checked yet. */ static int gzip_is_supported = -1;

1 0

[torbrowser/master] tighten up windows build options for libevent and tor so they can always find openssl's dlls
by erinn＠torproject.org 26 Oct '11

26 Oct '11

commit 75ac9322046be92d0ce547caf0e5b6fd6478856d Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Oct 26 01:51:06 2011 +0100 tighten up windows build options for libevent and tor so they can always find openssl's dlls --- build-scripts/windows.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 4a2de3d..f37a748 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -90,8 +90,8 @@ build-vidalia: cd $(VIDALIA_DIR)/build && make LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) -LIBEVENT_CFLAGS="-O -g" -LIBEVENT_LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" +LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include -O -g" +LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin -Wl,--nxcompat -Wl,--dynamicbase" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking build-libevent: cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) @@ -100,7 +100,7 @@ build-libevent: TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" -TOR_LDFLAGS="-L$(BUILT_DIR)/lib" +TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor: cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS)

1 0

[torbrowser/maint-2.2] tighten up windows build options for libevent and tor so they can always find openssl's dlls
by erinn＠torproject.org 26 Oct '11

26 Oct '11

commit 75ac9322046be92d0ce547caf0e5b6fd6478856d Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Oct 26 01:51:06 2011 +0100 tighten up windows build options for libevent and tor so they can always find openssl's dlls --- build-scripts/windows.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 4a2de3d..f37a748 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -90,8 +90,8 @@ build-vidalia: cd $(VIDALIA_DIR)/build && make LIBEVENT_DIR=$(FETCH_DIR)/libevent-$(LIBEVENT_VER) -LIBEVENT_CFLAGS="-O -g" -LIBEVENT_LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" +LIBEVENT_CFLAGS="-I$(BUILT_DIR)/include -O -g" +LIBEVENT_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin -Wl,--nxcompat -Wl,--dynamicbase" LIBEVENT_OPTS=--prefix=$(BUILT_DIR) --enable-static --disable-shared --disable-dependency-tracking build-libevent: cd $(LIBEVENT_DIR) && CFLAGS=$(LIBEVENT_CFLAGS) LDFLAGS=$(LIBEVENT_LDFLAGS) ./configure $(LIBEVENT_OPTS) @@ -100,7 +100,7 @@ build-libevent: TOR_DIR=$(FETCH_DIR)/tor-$(TOR_VER) TOR_CFLAGS="-O -g -I$(BUILT_DIR)/include" -TOR_LDFLAGS="-L$(BUILT_DIR)/lib" +TOR_LDFLAGS="-L$(BUILT_DIR)/lib -L$(BUILT_DIR)/bin" TOR_OPTS=--enable-static-libevent --with-libevent-dir=$(BUILT_DIR)/lib --prefix=$(BUILT_DIR) build-tor: cd $(TOR_DIR) && CFLAGS=$(TOR_CFLAGS) LDFLAGS=$(TOR_LDFLAGS) ./configure $(TOR_OPTS)

1 0