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

Move ntmain.c into libtor-app again

Browse Source 
It's needed by main.c

Fixes bug 26662; bug not in any released Tor.
This commit is contained in:
Nick Mathewson 2018-07-06 13:59:40 -04:00
parent 8b0920bb6f
commit 10c782d7fa
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/include.am
View File

@ -9,9 +9,6 @@ noinst_HEADERS += \
src/app/main/ntmain.h src/app/main/ntmain.h
src_app_tor_SOURCES = src/app/main/tor_main.c src_app_tor_SOURCES = src/app/main/tor_main.c
if BUILD_NT_SERVICES
src_app_tor_SOURCES += src/app/main/ntmain.c
endif
# -L flags need to go in LDFLAGS. -l flags need to go in LDADD. # -L flags need to go in LDFLAGS. -l flags need to go in LDADD.
# This seems to matter nowhere but on windows, but I assure you that it # This seems to matter nowhere but on windows, but I assure you that it

4
src/core/include.am
View File

@ -101,6 +101,10 @@ LIBTOR_APP_A_SOURCES = \
src/feature/stats/geoip.c \ src/feature/stats/geoip.c \
src/feature/stats/rephist.c src/feature/stats/rephist.c
if BUILD_NT_SERVICES
LIBTOR_APP_A_SOURCES += src/app/main/ntmain.c
endif
# #
# Modules are conditionnally compiled in tor starting here. We add the C files # Modules are conditionnally compiled in tor starting here. We add the C files
# only if the modules has been enabled at configure time. We always add the # only if the modules has been enabled at configure time. We always add the