Re: Windows port merge - Service support (part 2) [PATCH]

Applied with some small cleanups:

1. The USE_UNLINKD ifdef in unlinkd.cc is not applied. There should be
no reason for this ifdef, and you did not give any motivation why this
was done.

2. The USE_WIN32_SERVICE ifdefs is converted to #if USE_WIN32_SERVICE
without redundant checks for WIN32/CYGWIN. #if is the proper method to
check for config.h defines, and further this define should only be set
on platforms where it is available and if set elsewhere it is perfectly
fine if the compile crash and burns.

+#if defined(USE_WIN32_SERVICE) && (defined(_SQUID_MSWIN_) ||
defined(_SQUID_CYGWIN_))

became

+#if USE_WIN32_SERVICE

3. The #if defined(_SQUID_MSWIN_) || defined(_SQUID_CYGWIN_) wrap of
win32.cc has been removed. This is already done in automake to not
compile win32.cc on other platforms.

Another request for #ifdef cleanup in a future patch:

Today there is many references to #if defined(_SQUID_MSWIN_) ||
defined(_SQUID_CYGWIN_). I think it would be preferrable if these were
unified into a single #ifdef _SQUID_WIN32_ which is set on both
platforms, with _SQUID_MSWIN_ and _SQUID_CYGWIN_ reserved for things
unique to either of the two platforms.

Note: src/stat.cc was not astyled correctly.

Regards
Henrik

tis 2003-04-22 klockan 14.46 skrev Guido Serassio:
> Hi,
>
> This is the 9th of some splitted native Windows patches grouped by
> functionality.
>
> Native Windows port enhancements:
>
> - changed opt_no_daemon to global
> - now Cygwin can support daemon and Windows service mode in the same binary
> - added Windows platform info in cache_manager output
> - missing Makefile.am entry for squid_windows.h
> - added more Windows service support definitions
> - added cache.log info when unlinkd is disabled
> - storeFsDone() is always needed for some fs storage: Coss, Awin32
>
> The next two patches will be splitted in the following way:
>
> - Windows service support changes in main.cc
> - New command line options and configure support
>
> Regards
>
> Guido
>
>
> -
> =======================================================
> Serassio Guido
> Via Albenga, 11/4 10134 - Torino - ITALY
> E-mail: guido.serassio@serassio.it
> WWW: http://www.serassio.it

-- 
Henrik Nordstrom <hno@marasystems.com>
MARA Systems AB