Commit 10c782d7 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Move ntmain.c into libtor-app again 

It's needed by main.c

Fixes bug 26662; bug not in any released Tor.
parent 8b0920bb

src/app/include.am

+0 −3
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ noinst_HEADERS += \ 
	src/app/main/ntmain.h



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.

# This seems to matter nowhere but on windows, but I assure you that it

src/core/include.am

+4 −0
Original line number Diff line number Diff line
@@ -101,6 +101,10 @@ LIBTOR_APP_A_SOURCES = \ 
	src/feature/stats/geoip.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

# only if the modules has been enabled at configure time. We always add the