nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build with GCC < 3.3

Browse Source 
Preprocessor directives should not be put inside the arguments
of a macro. This is not supported on older GCC releases (< 3.3)
thus broke compilation on Haiku (running gcc2).
This commit is contained in:
Martin Hebnes Pedersen 2011-12-17 17:51:07 +01:00 committed by Nick Mathewson
parent f783a326b8
commit d5e964731c
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
changes/portability_01_haiku Normal file
View File

@ -0,0 +1,11 @@
o Minor buxfixes:
- During configure, search for library containing cos function as
libm lives in libcore on some platforms (BeOS/Haiku).
Linking against libm was hard-coded before. Bugfix on
0.2.2.2-alpha, fixes the first part of bug 4727. Patch and
analysis by Martin Hebnes Pedersen.
- Preprocessor directives should not be put inside the arguments
of a macro. This would break compilation with GCC releases prior
to version 3.3. Bugfix on 0.2.3.3-alpha, fixes the other part of
bug 4727. Patch and analysis by Martin Hebnes Pedersen.

7
src/or/main.c
View File

@ -2268,13 +2268,12 @@ tor_init(int argc, char *argv[])
{
const char *version = get_version();
log_notice(LD_GENERAL, "Tor v%s%s running on %s.", version,
#ifdef USE_BUFFEREVENTS
" (with bufferevents)",
log_notice(LD_GENERAL, "Tor v%s (with bufferevents) running on %s.",
version, get_uname());
#else
"",
log_notice(LD_GENERAL, "Tor v%s running on %s.", version, get_uname());
#endif
get_uname());
log_notice(LD_GENERAL, "Tor can't help you if you use it wrong! "
"Learn how to be safe at "