how do I fix this header conflict?

[Michael Matz]

Hi,

On Mon, 30 Jun 2003, Benjamin Reed wrote:

> Attached is a patch to handle darwin as a special case in the
> $kde_use_warnings check, and to change "-pedantic-errors" to "-Werror
> -Wmissing-prototypes".  Does this look alright?

No.  The case you inserted into in the second hunk looks currently like:

case $host in
  *-*-linux-gnu) ...  CXXFLAGS=... ;;
esac
CXXFLAGS="... $CXXFLAGS"

You changed it into:

case $host in
  *-*-linux-gnu) ...  CXXFLAGS=... ;;
  *-darwin*)
    CXXFLAGS="-Wall -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
  *)
    CXXFLAGS="-Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
esac

This isn't equivalent obviously.  You want to insert a _second_ switch
differeing between darwin and rest only.


Ciao,
Michael.