Skip to content

Commit

Permalink
GCC is warning about global functions with the same name as variables…
Browse files Browse the repository at this point in the history
… in the code, when using -Wshadow.

This is a little ridiculous because we have no idea what functions a given platform will provide, so we'll disable -Wshadow for now.
  • Loading branch information
slouken committed Jun 20, 2015
1 parent 903df4a commit fb5732d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 61 deletions.
38 changes: 0 additions & 38 deletions configure
Expand Up @@ -18701,43 +18701,6 @@ $as_echo "$need_gcc_Wno_multichar" >&6; }
fi
}

CheckWarnShadow()
{
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC -Wshadow option" >&5
$as_echo_n "checking for GCC -Wshadow option... " >&6; }
have_gcc_Wshadow=no

save_CFLAGS="$CFLAGS"
CFLAGS="$save_CFLAGS -Wshadow"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

int x = 0;

int
main ()
{


;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :

have_gcc_Wshadow=yes

fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gcc_Wshadow" >&5
$as_echo "$have_gcc_Wshadow" >&6; }
CFLAGS="$save_CFLAGS"

if test x$have_gcc_Wshadow = xyes; then
EXTRA_CFLAGS="$EXTRA_CFLAGS -Wshadow"
fi
}

CheckWayland()
{
# Check whether --enable-video-wayland was given.
Expand Down Expand Up @@ -23652,7 +23615,6 @@ $as_echo "#define SDL_TIMER_UNIX 1" >>confdefs.h
esac

CheckWarnAll
CheckWarnShadow

# Verify that we have all the platform specific files we need

Expand Down
23 changes: 0 additions & 23 deletions configure.in
Expand Up @@ -1159,28 +1159,6 @@ CheckWarnAll()
fi
}

dnl See if GCC's -Wshadow is supported.
CheckWarnShadow()
{
AC_MSG_CHECKING(for GCC -Wshadow option)
have_gcc_Wshadow=no

save_CFLAGS="$CFLAGS"
CFLAGS="$save_CFLAGS -Wshadow"
AC_TRY_COMPILE([
int x = 0;
],[
],[
have_gcc_Wshadow=yes
])
AC_MSG_RESULT($have_gcc_Wshadow)
CFLAGS="$save_CFLAGS"

if test x$have_gcc_Wshadow = xyes; then
EXTRA_CFLAGS="$EXTRA_CFLAGS -Wshadow"
fi
}

dnl Check for Wayland
CheckWayland()
{
Expand Down Expand Up @@ -3415,7 +3393,6 @@ esac

dnl Do this on all platforms, after everything else.
CheckWarnAll
CheckWarnShadow

# Verify that we have all the platform specific files we need

Expand Down

0 comments on commit fb5732d

Please sign in to comment.