torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'ticket31705_v2' into ticket31705_v2_merged

Browse Source 
Conflicts:
	src/feature/dirparse/authcert_parse.c
	src/feature/dirparse/ns_parse.c
	src/feature/hs/hs_service.c
	src/lib/conf/conftesting.h
	src/lib/log/log.h
	src/lib/thread/threads.h
	src/test/test_options.c

These conflicts were mostly related to autostyle improvements, with
one or two due to doxygen fixes.
This commit is contained in:
Nick Mathewson
2019-10-22 09:39:06 -04:00
parent 2d013bbe5c 7e7a4874b8
commit b2d487ae22
53 changed files with 296 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/evloop/timers.c
+3 -1
View File
@@ -56,7 +56,9 @@ struct timeout_cb {
/*
* These definitions are for timeouts.c and timeouts.h.
*/
#ifdef __GNUC__
#ifdef COCCI
#define TIMEOUT_PUBLIC
#elif defined(__GNUC__)
/* We're not exposing any of the functions outside this file. */
#define TIMEOUT_PUBLIC __attribute__((__unused__)) static
#else