Commit a8323cc3 authored by Yang Tse's avatar Yang Tse
Browse files

icc adjustments

parent aa297358

acinclude.m4

+4 −4
Original line number Diff line number Diff line
@@ -2686,10 +2686,10 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS], 
         WARN="-wd279,269,981,1418,1419"

         WARN=""



         if test "$gccnum" -gt "600"; then

            dnl icc 6.0 and older doesn't have the -Wall flag

            WARN="-Wall $WARN"

         fi

         dnl if test "$gccnum" -gt "600"; then

         dnl    dnl icc 6.0 and older doesn't have the -Wall flag

         dnl    WARN="-Wall $WARN"

         dnl fi

       else dnl $ICC = yes

         dnl this is a set of options we believe *ALL* gcc versions support:

         WARN="-W -Wall -Wwrite-strings -pedantic -Wpointer-arith -Wnested-externs -Winline -Wmissing-prototypes"

ares/acinclude.m4

+4 −4
Original line number Diff line number Diff line
@@ -1894,10 +1894,10 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS], 
         WARN="-wd279,269,981,1418,1419"

         WARN=""



         if test "$gccnum" -gt "600"; then

            dnl icc 6.0 and older doesn't have the -Wall flag

            WARN="-Wall $WARN"

         fi

         dnl if test "$gccnum" -gt "600"; then

         dnl    dnl icc 6.0 and older doesn't have the -Wall flag

         dnl    WARN="-Wall $WARN"

         dnl fi

       else dnl $ICC = yes

         dnl this is a set of options we believe *ALL* gcc versions support:

         WARN="-W -Wall -Wwrite-strings -pedantic -Wpointer-arith -Wnested-externs -Winline -Wmissing-prototypes"

ares/configure.ac

+6 −0
Original line number Diff line number Diff line
@@ -229,6 +229,12 @@ if test "$curl_cv_have_def___INTEL_COMPILER" = "yes"; then 
  dnl On Linux this compiler uses gcc's header files, so

  dnl we select ANSI C89 dialect plus GNU extensions.

  CPPFLAGS="$CPPFLAGS -std=gnu89"

  if test "$curl_cv_def___INTEL_COMPILER" -gt "600"; then

    dnl Show errors, warnings, and remarks

    CPPFLAGS="$CPPFLAGS -Wall"

    dnl Perform extra compile-time code checking

    CPPFLAGS="$CPPFLAGS -Wcheck"

  fi

  dnl Change some warnings into errors

  dnl #140: too many arguments in function call

  dnl #147: declaration is incompatible with 'previous one'

configure.ac

+6 −0
Original line number Diff line number Diff line
@@ -303,6 +303,12 @@ if test "$curl_cv_have_def___INTEL_COMPILER" = "yes"; then 
  dnl On Linux this compiler uses gcc's header files, so

  dnl we select ANSI C89 dialect plus GNU extensions.

  CPPFLAGS="$CPPFLAGS -std=gnu89"

  if test "$curl_cv_def___INTEL_COMPILER" -gt "600"; then

    dnl Show errors, warnings, and remarks

    CPPFLAGS="$CPPFLAGS -Wall"

    dnl Perform extra compile-time code checking

    CPPFLAGS="$CPPFLAGS -Wcheck"

  fi

  dnl Change some warnings into errors

  dnl #140: too many arguments in function call

  dnl #147: declaration is incompatible with 'previous one'