August 2018 - tor-commits - lists.torproject.org

[tor/maint-0.2.9] Silence a compilation warning on MSVC 2017 and clang-cl
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit cc4ea34a262993bf69836d1bffa3175e24261565 Author: teor <teor(a)torproject.org> Date: Thu Aug 23 18:55:39 2018 +1000 Silence a compilation warning on MSVC 2017 and clang-cl test.c no longer uses lround(), so we don't need to declare it, and we can use math.h for fabs(). Fixes bug 27185; bugfix on 0.2.2.2-alpha. --- changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/changes/bug27185 b/changes/bug27185 new file mode 100644 index 000000000..79221b3df --- /dev/null +++ b/changes/bug27185 @@ -0,0 +1,3 @@ + o Minor bugfixes (Windows, compilation): + - Silence a compilation warning on MSVC 2017 and clang-cl. + Fixes bug 27185; bugfix on 0.2.2.2-alpha. diff --git a/src/test/test.c b/src/test/test.c index 0fef69790..6330eb9b9 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -22,6 +22,8 @@ #include <dirent.h> #endif +#include <math.h> + /* These macros pull in declarations for some functions and structures that * are typically file-private. */ #define GEOIP_PRIVATE @@ -31,14 +33,6 @@ #define MAIN_PRIVATE #define STATEFILE_PRIVATE -/* - * Linux doesn't provide lround in math.h by default, but mac os does... - * It's best just to leave math.h out of the picture entirely. - */ -//#include <math.h> -long int lround(double x); -double fabs(double x); - #include "or.h" #include "backtrace.h" #include "buffers.h"

1 0

[tor/maint-0.3.2] Silence a compilation warning on MSVC 2017 and clang-cl
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit cc4ea34a262993bf69836d1bffa3175e24261565 Author: teor <teor(a)torproject.org> Date: Thu Aug 23 18:55:39 2018 +1000 Silence a compilation warning on MSVC 2017 and clang-cl test.c no longer uses lround(), so we don't need to declare it, and we can use math.h for fabs(). Fixes bug 27185; bugfix on 0.2.2.2-alpha. --- changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/changes/bug27185 b/changes/bug27185 new file mode 100644 index 000000000..79221b3df --- /dev/null +++ b/changes/bug27185 @@ -0,0 +1,3 @@ + o Minor bugfixes (Windows, compilation): + - Silence a compilation warning on MSVC 2017 and clang-cl. + Fixes bug 27185; bugfix on 0.2.2.2-alpha. diff --git a/src/test/test.c b/src/test/test.c index 0fef69790..6330eb9b9 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -22,6 +22,8 @@ #include <dirent.h> #endif +#include <math.h> + /* These macros pull in declarations for some functions and structures that * are typically file-private. */ #define GEOIP_PRIVATE @@ -31,14 +33,6 @@ #define MAIN_PRIVATE #define STATEFILE_PRIVATE -/* - * Linux doesn't provide lround in math.h by default, but mac os does... - * It's best just to leave math.h out of the picture entirely. - */ -//#include <math.h> -long int lround(double x); -double fabs(double x); - #include "or.h" #include "backtrace.h" #include "buffers.h"

1 0

[tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit 36bb11a65081bb0c2a2a86359c6386bde67f8046 Merge: c1ad40627 cc4ea34a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 19:36:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --cc src/test/test.c index 383bc0000,6330eb9b9..a935ac36a --- a/src/test/test.c +++ b/src/test/test.c @@@ -20,8 -20,10 +20,10 @@@ #include <direct.h> #else #include <dirent.h> -#endif +#endif /* defined(_WIN32) */ + #include <math.h> + /* These macros pull in declarations for some functions and structures that * are typically file-private. */ #define GEOIP_PRIVATE

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit 36bb11a65081bb0c2a2a86359c6386bde67f8046 Merge: c1ad40627 cc4ea34a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 19:36:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --cc src/test/test.c index 383bc0000,6330eb9b9..a935ac36a --- a/src/test/test.c +++ b/src/test/test.c @@@ -20,8 -20,10 +20,10 @@@ #include <direct.h> #else #include <dirent.h> -#endif +#endif /* defined(_WIN32) */ + #include <math.h> + /* These macros pull in declarations for some functions and structures that * are typically file-private. */ #define GEOIP_PRIVATE

1 0

[tor/maint-0.3.3] Silence a compilation warning on MSVC 2017 and clang-cl
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit cc4ea34a262993bf69836d1bffa3175e24261565 Author: teor <teor(a)torproject.org> Date: Thu Aug 23 18:55:39 2018 +1000 Silence a compilation warning on MSVC 2017 and clang-cl test.c no longer uses lround(), so we don't need to declare it, and we can use math.h for fabs(). Fixes bug 27185; bugfix on 0.2.2.2-alpha. --- changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/changes/bug27185 b/changes/bug27185 new file mode 100644 index 000000000..79221b3df --- /dev/null +++ b/changes/bug27185 @@ -0,0 +1,3 @@ + o Minor bugfixes (Windows, compilation): + - Silence a compilation warning on MSVC 2017 and clang-cl. + Fixes bug 27185; bugfix on 0.2.2.2-alpha. diff --git a/src/test/test.c b/src/test/test.c index 0fef69790..6330eb9b9 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -22,6 +22,8 @@ #include <dirent.h> #endif +#include <math.h> + /* These macros pull in declarations for some functions and structures that * are typically file-private. */ #define GEOIP_PRIVATE @@ -31,14 +33,6 @@ #define MAIN_PRIVATE #define STATEFILE_PRIVATE -/* - * Linux doesn't provide lround in math.h by default, but mac os does... - * It's best just to leave math.h out of the picture entirely. - */ -//#include <math.h> -long int lround(double x); -double fabs(double x); - #include "or.h" #include "backtrace.h" #include "buffers.h"

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit e01ea64f0a072b321bb8b33e32cfa5644b4364d4 Merge: 8691046ac 36bb11a65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 19:36:45 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit 36bb11a65081bb0c2a2a86359c6386bde67f8046 Merge: c1ad40627 cc4ea34a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 19:36:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --cc src/test/test.c index 383bc0000,6330eb9b9..a935ac36a --- a/src/test/test.c +++ b/src/test/test.c @@@ -20,8 -20,10 +20,10 @@@ #include <direct.h> #else #include <dirent.h> -#endif +#endif /* defined(_WIN32) */ + #include <math.h> + /* These macros pull in declarations for some functions and structures that * are typically file-private. */ #define GEOIP_PRIVATE

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit 36bb11a65081bb0c2a2a86359c6386bde67f8046 Merge: c1ad40627 cc4ea34a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 19:36:45 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --cc src/test/test.c index 383bc0000,6330eb9b9..a935ac36a --- a/src/test/test.c +++ b/src/test/test.c @@@ -20,8 -20,10 +20,10 @@@ #include <direct.h> #else #include <dirent.h> -#endif +#endif /* defined(_WIN32) */ + #include <math.h> + /* These macros pull in declarations for some functions and structures that * are typically file-private. */ #define GEOIP_PRIVATE

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit d50f90bfc4457b499d5bf56b674289f70f1004bd Merge: 2ae92ab97 6e0872e86 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 19:37:32 2018 -0400 Merge branch 'maint-0.3.4' changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --cc src/test/test.c index 745aa987a,aea3ad659..f96a0b33e --- a/src/test/test.c +++ b/src/test/test.c @@@ -34,42 -33,28 +36,34 @@@ #define MAIN_PRIVATE #define STATEFILE_PRIVATE - /* - * Linux doesn't provide lround in math.h by default, but mac os does... - * It's best just to leave math.h out of the picture entirely. - */ - //#include <math.h> - long int lround(double x); - double fabs(double x); - -#include "or.h" -#include "backtrace.h" -#include "buffers.h" -#include "circuitlist.h" -#include "circuitstats.h" -#include "compress.h" -#include "config.h" -#include "connection_edge.h" -#include "rendcommon.h" -#include "rendcache.h" -#include "test.h" -#include "main.h" -#include "memarea.h" -#include "onion.h" -#include "onion_ntor.h" -#include "onion_fast.h" -#include "onion_tap.h" -#include "policies.h" -#include "rephist.h" -#include "routerparse.h" -#include "statefile.h" -#include "crypto_curve25519.h" +#include "core/or/or.h" +#include "lib/err/backtrace.h" +#include "lib/container/buffers.h" +#include "core/or/circuitlist.h" +#include "core/or/circuitstats.h" +#include "lib/compress/compress.h" +#include "app/config/config.h" +#include "core/or/connection_edge.h" +#include "feature/rend/rendcommon.h" +#include "feature/rend/rendcache.h" +#include "test/test.h" +#include "core/mainloop/main.h" +#include "lib/memarea/memarea.h" +#include "core/crypto/onion.h" +#include "core/crypto/onion_ntor.h" +#include "core/crypto/onion_fast.h" +#include "core/crypto/onion_tap.h" +#include "core/or/policies.h" +#include "feature/stats/rephist.h" +#include "feature/nodelist/routerparse.h" +#include "app/config/statefile.h" +#include "lib/crypt_ops/crypto_curve25519.h" + +#include "core/or/extend_info_st.h" +#include "core/or/or_circuit_st.h" +#include "feature/rend/rend_encoded_v2_service_descriptor_st.h" +#include "feature/rend/rend_intro_point_st.h" +#include "feature/rend/rend_service_descriptor_st.h" /** Run unit tests for the onion handshake code. */ static void

1 0

[tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 23 Aug '18

23 Aug '18

commit e01ea64f0a072b321bb8b33e32cfa5644b4364d4 Merge: 8691046ac 36bb11a65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 23 19:36:45 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-)

1 0