Re: /bzr/squid3/trunk/ r11178: Added specific flags for Intel(R)'s icc compiler

*sigh*. An unrelated fix slipped in.
Do you want me to recommit or is it trivial enough that it can be left
like this?

  K.

On Tue, Jan 25, 2011 at 10:29 PM, Francesco Chemolli
<kinkie_at_squid-cache.org> wrote:
> ------------------------------------------------------------
> revno: 11178 [merge]
> committer: Francesco Chemolli <kinkie_at_squid-cache.org>
> branch nick: trunk
> timestamp: Tue 2011-01-25 22:29:23 +0100
> message:
>  Added specific flags for Intel(R)'s icc compiler
> modified:
>  acinclude/compiler-flags.m4
>  lib/smblib/smblib-util.c
>
> === modified file 'acinclude/compiler-flags.m4'
> --- a/acinclude/compiler-flags.m4       2010-08-24 10:35:03 +0000
> +++ b/acinclude/compiler-flags.m4       2011-01-25 21:29:23 +0000
> @@ -86,6 +86,15 @@
>  #endif
>     ]])],[squid_cv_compiler="sunstudio"],[])
>   fi
> +  dnl Intel CC
> +  if test -z "$squid_cv_compiler" ; then
> +   AC_COMPILE_IFELSE([
> +    AC_LANG_PROGRAM([[
> +#if !defined(__ICC)
> +#error "not Intel(R) C++ Compiler"
> +#endif
> +    ]])],[squid_cv_compiler="icc"],[])
> +  fi
>   dnl end of block to be repeated
>   if test -z "$squid_cv_compiler" ; then
>    squid_cv_compiler="none"
> @@ -122,6 +131,13 @@
>    squid_cv_cc_option_optimize="-fast"
>    squid_cv_cc_arg_pipe=""
>    ;;
> +  icc)
> +   squid_cv_cxx_option_werror="-Werror"
> +   squid_cv_cc_option_werror="$squid_cv_cxx_option_werror"
> +   squid_cv_cc_option_wall="-Wall"
> +   squid_cv_cc_option_optimize="-O2"
> +   squid_cv_cc_arg_pipe=""
> +   ;;
>   *)
>    squid_cv_cxx_option_werror=""
>    squid_cv_cc_option_werror=""
>
> === modified file 'lib/smblib/smblib-util.c'
> --- a/lib/smblib/smblib-util.c  2010-10-17 03:24:24 +0000
> +++ b/lib/smblib/smblib-util.c  2011-01-11 22:25:34 +0000
> @@ -48,11 +48,13 @@
>                    -1
>                   };
>
> +#if UNDEFINED
>  char *SMB_DOSTimToStr(int DOS_time);
>  char *SMB_AtrToStr(int attribs, BOOL verbose);
>  int SMB_Get_Tree_MBS(SMB_Tree_Handle tree);
>  int SMB_Get_Max_Buf_Siz(SMB_Handle_Type Con_Handle);
>  int SMB_Get_Protocol_IDX(SMB_Handle_Type Con_Handle);
> +#endif /* UNDEFINED */
>  int SMB_Get_Protocol(SMB_Handle_Type Con_Handle);
>  int SMB_Figure_Protocol(const char *dialects[], int prot_index);
>  int SMB_TreeDisconnect(SMB_Tree_Handle Tree_Handle, BOOL discard);
> @@ -80,6 +82,7 @@
>
>  /* Convert a DOS Date_Time to a local host type date time for printing */
>
> +#if UNDEFINED
>  char *SMB_DOSTimToStr(int DOS_time)
>
>  {
> @@ -172,6 +175,7 @@
>     }
>
>  }
> +#endif /* UNDEFINED */
>
>  /* Pick up the protocol from the connection structure                       */
>
>
>
>

-- 
    /kinkie