<arma> did you get it working on win32? or just compiling

svn:r2136
This commit is contained in:
Nick Mathewson 2004-08-04 04:58:30 +00:00
parent 78f12ffcca
commit 75684a48d5

View File

@ -63,7 +63,7 @@ int has_fetched_directory=0;
* entry to inform the user that Tor is working. */ * entry to inform the user that Tor is working. */
int has_completed_circuit=0; int has_completed_circuit=0;
#ifdef MS_WINDOWS #ifdef MS_WINDOWS_SERVICE
SERVICE_STATUS service_status; SERVICE_STATUS service_status;
SERVICE_STATUS_HANDLE hStatus; SERVICE_STATUS_HANDLE hStatus;
#endif #endif
@ -810,11 +810,12 @@ static int do_main_loop(void) {
} }
for(;;) { for(;;) {
#ifdef MS_WINDOWS /* Do service stuff only on windows. */ #ifdef MS_WINDOWS_SERVICE /* Do service stuff only on windows. */
if (service_status.dwCurrentState != SERVICE_RUNNING) { if (service_status.dwCurrentState != SERVICE_RUNNING) {
return 0; return 0;
} }
#else /* do signal stuff only on unix */ #endif
#ifndef MS_WINDOWS /* do signal stuff only on unix */
if(please_shutdown) { if(please_shutdown) {
if(!server_mode()) { /* do it now */ if(!server_mode()) { /* do it now */
log(LOG_NOTICE,"Interrupt: exiting cleanly."); log(LOG_NOTICE,"Interrupt: exiting cleanly.");
@ -1058,7 +1059,7 @@ void tor_cleanup(void) {
crypto_global_cleanup(); crypto_global_cleanup();
} }
#ifdef MS_WINDOWS #ifdef MS_WINDOWS_SERVICE
void nt_service_control(DWORD request) void nt_service_control(DWORD request)
{ {
switch (request) { switch (request) {